From: Jesse Barnes Date: Tue, 4 Jan 2011 23:09:35 +0000 (-0800) Subject: drm/i915: assert panel is unlocked before writing transcoder timing regs X-Git-Tag: v2.6.39-rc1~458^2~9^2~64 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d9b6cb568bc6eca8db88357bf8bbb92d42a91b1e;p=karo-tx-linux.git drm/i915: assert panel is unlocked before writing transcoder timing regs Otherwise our writes will be silently ignored. Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 515e0b99f32e..f274d5b1b7c6 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2444,7 +2444,8 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) I915_WRITE(PCH_DPLL_SEL, temp); } - /* set transcoder timing */ + /* set transcoder timing, panel must allow it */ + assert_panel_unlocked(dev_priv, pipe); I915_WRITE(TRANS_HTOTAL(pipe), I915_READ(HTOTAL(pipe))); I915_WRITE(TRANS_HBLANK(pipe), I915_READ(HBLANK(pipe))); I915_WRITE(TRANS_HSYNC(pipe), I915_READ(HSYNC(pipe)));