Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
Daniel writes: "- some register magic to fix hsw crw (Paulo&Ben) - fix backlight destruction for cpu edp (Jani) - fix gen ch7xxx dvo ->get_hw_state - fixup the plane->pipe fixup code, the broken version massively angers the modeset sanity checks - kill pipe A quirk for i855gm, otherwise I get a black screen with the above patch - fixup for gem_get_page helper (Chris) - fixup guardband clipping w/a (Ken), without this mesa master can erronously drop vertices on snb, mesa 9.0 has the optimization reverted - another pageflip vs. modeset fix - kill bogus BUG_ON which broke ums+gem from Willy Tarreau (gasp, people are still using this!)" * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel: drm/i915: fix non-DP-D eDP backlight cleanup and module reload drm/i915: HSW CRW stability magic drm/i915/dvo-ch7xxx: fix get_hw_state drm/i915: fixup the plane->pipe fixup code drm/i915: rip out the pipe A quirk for i855gm drm/i915: disable wc gtt pte mappings on gen2 drm/i915: fixup i915_gem_object_get_page inline helper drm/i915: Disallow preallocation of requests drm/i915: Set guardband clipping workaround bit in the right register. drm/i915: paper over a pipe-enable vs pageflip race drm/i915: remove useless BUG_ON which caused a regression in 3.5.
Showing
- drivers/char/agp/intel-gtt.c 1 addition, 1 deletiondrivers/char/agp/intel-gtt.c
- drivers/gpu/drm/i915/dvo_ch7xxx.c 3 additions, 3 deletionsdrivers/gpu/drm/i915/dvo_ch7xxx.c
- drivers/gpu/drm/i915/i915_drv.h 7 additions, 2 deletionsdrivers/gpu/drm/i915/i915_drv.h
- drivers/gpu/drm/i915/i915_gem.c 11 additions, 8 deletionsdrivers/gpu/drm/i915/i915_gem.c
- drivers/gpu/drm/i915/i915_reg.h 1 addition, 1 deletiondrivers/gpu/drm/i915/i915_reg.h
- drivers/gpu/drm/i915/intel_display.c 34 additions, 13 deletionsdrivers/gpu/drm/i915/intel_display.c
- drivers/gpu/drm/i915/intel_dp.c 2 additions, 1 deletiondrivers/gpu/drm/i915/intel_dp.c
- drivers/gpu/drm/i915/intel_overlay.c 15 additions, 57 deletionsdrivers/gpu/drm/i915/intel_overlay.c
- drivers/gpu/drm/i915/intel_pm.c 2 additions, 2 deletionsdrivers/gpu/drm/i915/intel_pm.c
Please register or sign in to comment