From: Chris Wilson Date: Fri, 11 May 2012 08:21:25 +0000 (+0100) Subject: drm/i915: Assert that the transcoder is indeed off before modifying it X-Git-Tag: v3.5-rc1~100^2~25^2~11 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e7e164db6db292d6f804ec6cd25f29ff62dd0618;p=karo-tx-linux.git drm/i915: Assert that the transcoder is indeed off before modifying it Inspired by a recent regression that seems to confuse pch transcoder state, let's be a bit more paranoid. References: https://bugs.freedesktop.org/show_bug.cgi?id=49712 Cc: Jesse Barnes Signed-off-by: Chris Wilson [danvet: Pimped commit message.] Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 1a06f97e73f8..391439fa17b2 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2782,6 +2782,8 @@ static void ironlake_pch_enable(struct drm_crtc *crtc) int pipe = intel_crtc->pipe; u32 reg, temp; + assert_transcoder_disabled(dev_priv, pipe); + /* For PCH output, training FDI link */ dev_priv->display.fdi_link_train(crtc);