]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
drm/i915: don't assert_pch_ports_disabled on LPT
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Wed, 31 Oct 2012 20:12:50 +0000 (18:12 -0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Sun, 11 Nov 2012 22:51:24 +0000 (23:51 +0100)
That function is made for IBX. Running it on LPT will trigger tons of
"unclaimed register" errors. The only port remaining on LPT is
PCH_ADPA.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c

index 43ad1a556b3cdd8c6f1abbbdb6f12f05eb02696f..7bab7adf73455b92ec348f1a9abbfbf5791bbd4b 100644 (file)
@@ -1774,9 +1774,6 @@ static void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv,
        assert_fdi_tx_disabled(dev_priv, pipe);
        assert_fdi_rx_disabled(dev_priv, pipe);
 
-       /* Ports must be off as well */
-       assert_pch_ports_disabled(dev_priv, pipe);
-
        reg = TRANSCONF(pipe);
        val = I915_READ(reg);
        val &= ~TRANS_ENABLE;