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 <[email protected]>
Signed-off-by: Chris Wilson <[email protected]>
[danvet: Pimped commit message.]
Signed-off-by: Daniel Vetter <[email protected]>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 1a06f97e73f808a01fc99eb3ffcee81f2c0f9f5b..391439fa17b2e8479624abc5bc760c4a01c798b1 100644 (file)
--- 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);