diff mbox

[31/36] drm/i915: don't assert_pch_ports_disabled on LPT

Message ID 1351714375-15284-32-git-send-email-przanoni@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Paulo Zanoni Oct. 31, 2012, 8:12 p.m. UTC 
From: Paulo Zanoni <paulo.r.zanoni@intel.com>

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>
---
 drivers/gpu/drm/i915/intel_display.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Daniel Vetter Nov. 1, 2012, 4:21 p.m. UTC | #1 
On Wed, Oct 31, 2012 at 06:12:50PM -0200, Paulo Zanoni wrote:
> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
> 
> 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>
Actually I've had to stay around for a while longer before heading off, so
reviewed and applied a few more patches, up to this one here (minus the
one I've dropped).

Thanks, Daniel
> ---
>  drivers/gpu/drm/i915/intel_display.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 10ea4f5..7d858f8 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -1775,9 +1775,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;
> -- 
> 1.7.11.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 10ea4f5..7d858f8 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1775,9 +1775,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;