Merge branch 'linux-4.3' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
Nothing too crazy here, a couple of regression fixes + runpm/fbcon race fix. * 'linux-4.3' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: drm/nouveau/bios: fix OF loading drm/nouveau/fbcon: take runpm reference when userspace has an open fd drm/nouveau/nouveau: Disable AGP for SiS 761 drm/nouveau/display: allow up to 16k width/height for fermi+ drm/nouveau/bios: translate devinit pri/sec i2c bus to internal identifiers
No related branches found
No related tags found
Showing
- drivers/gpu/drm/nouveau/nouveau_display.c 5 additions, 1 deletiondrivers/gpu/drm/nouveau/nouveau_display.c
- drivers/gpu/drm/nouveau/nouveau_fbcon.c 24 additions, 0 deletionsdrivers/gpu/drm/nouveau/nouveau_fbcon.c
- drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c 6 additions, 0 deletionsdrivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
- drivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h 3 additions, 0 deletionsdrivers/gpu/drm/nouveau/nvkm/subdev/bios/priv.h
- drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c 18 additions, 9 deletionsdrivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c
- drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c 15 additions, 2 deletionsdrivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c
- drivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.c 6 additions, 2 deletionsdrivers/gpu/drm/nouveau/nvkm/subdev/pci/agp.c
Loading
Please register or sign in to comment