From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [pull] drm-intel-fixes Date: Fri, 12 Oct 2012 11:03:40 +0200 Message-ID: <20121012090340.GD5155@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Dave Airlie Cc: Intel Graphics Development , DRI Development List-Id: dri-devel@lists.freedesktop.org Hi Dave, A bit of paranoid-WARNs fallout from modeset, otherwise just small fixlets: - 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!) Otherwise I have some voodoo memory barriers from Chris and the ugly cpu_reloc stuff (which somehow seems to work on 3.7). And there's also some undue amount of modeset sanity check noises on i830M that I need to look at a bit closer. Cheers, Daniel PS: The last-minute rebase is because of a missing cc: stable tag. The following changes since commit f8f2ac9a76b0f80a6763ca316116a7bab8486997: drm/i915: Fix GT_MODE default value (2012-10-04 18:44:13 +0200) are available in the git repository at: git://people.freedesktop.org/~danvet/drm-intel drm-intel-fixes for you to fetch changes up to be3cd5e37716bcf1579f63bdd919345a1f9692b9: drm/i915: fix non-DP-D eDP backlight cleanup and module reload (2012-10-12 10:59:12 +0200) ---------------------------------------------------------------- Chris Wilson (2): drm/i915: Disallow preallocation of requests drm/i915: fixup i915_gem_object_get_page inline helper Daniel Vetter (5): drm/i915: paper over a pipe-enable vs pageflip race drm/i915: disable wc gtt pte mappings on gen2 drm/i915: rip out the pipe A quirk for i855gm drm/i915: fixup the plane->pipe fixup code drm/i915/dvo-ch7xxx: fix get_hw_state Jani Nikula (1): drm/i915: fix non-DP-D eDP backlight cleanup and module reload Kenneth Graunke (1): drm/i915: Set guardband clipping workaround bit in the right register. Rodrigo Vivi (1): drm/i915: HSW CRW stability magic Willy Tarreau (1): drm/i915: remove useless BUG_ON which caused a regression in 3.5. drivers/char/agp/intel-gtt.c | 2 +- drivers/gpu/drm/i915/dvo_ch7xxx.c | 6 +-- drivers/gpu/drm/i915/i915_drv.h | 9 ++++- drivers/gpu/drm/i915/i915_gem.c | 19 +++++---- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_display.c | 47 ++++++++++++++++------ drivers/gpu/drm/i915/intel_dp.c | 3 +- drivers/gpu/drm/i915/intel_overlay.c | 72 +++++++--------------------------- drivers/gpu/drm/i915/intel_pm.c | 4 +- 9 files changed, 76 insertions(+), 88 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch