Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie: "Just some regression fixes from Ben along with a variable that gcc failed to spot is uninitialised." * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: nouveau: initialise has_optimus variable. drm/nv10/gpio: fix thinko in mask for gpio lines 2-9 nvc0/fb: shut up PMFB interrupt after the first occurrence drm/nouveau/hdmi: use correct hdmi regs for nvaa/nvac drm/nouveau/bios: fix regression on some nv4x board
Showing
- drivers/gpu/drm/nouveau/nouveau_acpi.c 1 addition, 1 deletiondrivers/gpu/drm/nouveau/nouveau_acpi.c
- drivers/gpu/drm/nouveau/nouveau_bios.c 7 additions, 3 deletionsdrivers/gpu/drm/nouveau/nouveau_bios.c
- drivers/gpu/drm/nouveau/nouveau_hdmi.c 3 additions, 1 deletiondrivers/gpu/drm/nouveau/nouveau_hdmi.c
- drivers/gpu/drm/nouveau/nv10_gpio.c 1 addition, 1 deletiondrivers/gpu/drm/nouveau/nv10_gpio.c
- drivers/gpu/drm/nouveau/nvc0_fb.c 5 additions, 0 deletionsdrivers/gpu/drm/nouveau/nvc0_fb.c
Please register or sign in to comment