From: Paulo Zanoni Date: Wed, 31 Oct 2012 20:12:50 +0000 (-0200) Subject: drm/i915: don't assert_pch_ports_disabled on LPT X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=69d3ed5a6fc2e7ac8f848711d9bb6af9b3baf77b;p=openwrt%2Fstaging%2Fblogic.git drm/i915: don't assert_pch_ports_disabled on LPT 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 Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 43ad1a556b3c..7bab7adf7345 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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;