From e7e164db6db292d6f804ec6cd25f29ff62dd0618 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 11 May 2012 09:21:25 +0100 Subject: [PATCH] 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 --- drivers/gpu/drm/i915/intel_display.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 1a06f97..391439f 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); -- 2.7.4