| From 89cda7e13d3f55c52ccf0f9e4ecb76b9a4ec96d1 Mon Sep 17 00:00:00 2001 |
| From: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Date: Thu, 18 Apr 2013 16:35:41 -0300 |
| Subject: drm/i915: use cpu_transcoder for TRANS_DDI_FUNC_CTL |
| |
| ... 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> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit f196e6bedb1b8a76f8526798e0feeb7a213e7505) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 5 ++--- |
| 1 file changed, 2 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c |
| index f81c1fce9621..ea83011e454e 100644 |
| --- a/drivers/gpu/drm/i915/intel_display.c |
| +++ b/drivers/gpu/drm/i915/intel_display.c |
| @@ -6002,16 +6002,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; |
| } |
| |
| -- |
| 1.8.5.rc3 |
| |
