diff mbox

[2/7] drm/i915: use cpu_transcoder for TRANS_DDI_FUNC_CTL

Message ID 1366313746-3659-3-git-send-email-przanoni@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Paulo Zanoni April 18, 2013, 7:35 p.m. UTC 
From: Paulo Zanoni <paulo.r.zanoni@intel.com>

... inside haswell_get_pipe_config. Because there's one TRANS_DDI_FUNC_CTL
register per CPU transcoder, not per pipe. This solves "unclaimed register"
messages when booting with eDP only and using the i915.disable_power_well=1.

Also fix a comment and remove an useless empty line.

The error messages were caused by:

  commit 88adfff1ad5019f65b9d0b4e1a4ac900fb065183
  Author: Daniel Vetter <daniel.vetter@ffwll.ch>
  Date:   Thu Mar 28 10:42:01 2013 +0100
      drm/i915: hw readout support for ->has_pch_encoders

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Lespiau, Damien April 19, 2013, 5:21 a.m. UTC | #1 
On Thu, Apr 18, 2013 at 04:35:41PM -0300, Paulo Zanoni wrote:
> From: Paulo Zanoni <paulo.r.zanoni@intel.com>
> 
> ... inside haswell_get_pipe_config. Because there's one TRANS_DDI_FUNC_CTL
> register per CPU transcoder, not per pipe. This solves "unclaimed register"
> messages when booting with eDP only and using the i915.disable_power_well=1.
> 
> Also fix a comment and remove an useless empty line.
> 
> The error messages were caused by:
> 
>   commit 88adfff1ad5019f65b9d0b4e1a4ac900fb065183
>   Author: Daniel Vetter <daniel.vetter@ffwll.ch>
>   Date:   Thu Mar 28 10:42:01 2013 +0100
>       drm/i915: hw readout support for ->has_pch_encoders
> 
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>

Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Daniel Vetter April 19, 2013, 8:16 a.m. UTC | #2 
On Fri, Apr 19, 2013 at 06:21:18AM +0100, Damien Lespiau wrote:
> On Thu, Apr 18, 2013 at 04:35:41PM -0300, Paulo Zanoni wrote:
> > From: Paulo Zanoni <paulo.r.zanoni@intel.com>
> > 
> > ... inside haswell_get_pipe_config. Because there's one TRANS_DDI_FUNC_CTL
> > register per CPU transcoder, not per pipe. This solves "unclaimed register"
> > messages when booting with eDP only and using the i915.disable_power_well=1.
> > 
> > Also fix a comment and remove an useless empty line.
> > 
> > The error messages were caused by:
> > 
> >   commit 88adfff1ad5019f65b9d0b4e1a4ac900fb065183
> >   Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> >   Date:   Thu Mar 28 10:42:01 2013 +0100
> >       drm/i915: hw readout support for ->has_pch_encoders
> > 
> > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> 
> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>

Up to this patch here merged to dinq, thanks.
-Daniel
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 61636de..b86023d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5868,16 +5868,15 @@  static bool haswell_get_pipe_config(struct intel_crtc *crtc,
 		return false;
 
 	/*
-	 * aswell has only FDI/PCH transcoder A. It is which is connected to
+	 * Haswell has only FDI/PCH transcoder A. It is which is connected to
 	 * DDI E. So just check whether this pipe is wired to DDI E and whether
 	 * the PCH transcoder is on.
 	 */
-	tmp = I915_READ(TRANS_DDI_FUNC_CTL(crtc->pipe));
+	tmp = I915_READ(TRANS_DDI_FUNC_CTL(cpu_transcoder));
 	if ((tmp & TRANS_DDI_PORT_MASK) == TRANS_DDI_SELECT_PORT(PORT_E) &&
 	    I915_READ(TRANSCONF(PIPE_A)) & TRANS_ENABLE)
 		pipe_config->has_pch_encoder = true;
 
-
 	return true;
 }