34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
|
From patchwork Tue Jan 4 18:46:49 2011
|
||
|
|
Content-Type: text/plain; charset="utf-8"
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Transfer-Encoding: 7bit
|
||
|
|
Subject: drm/i915: check eDP encoder correctly when setting modes
|
||
|
|
Date: Tue, 04 Jan 2011 18:46:49 -0000
|
||
|
|
From: Jesse Barnes <jbarnes@virtuousgeek.org>
|
||
|
|
X-Patchwork-Id: 451441
|
||
|
|
Message-Id: <1294166809-3316-1-git-send-email-jbarnes@virtuousgeek.org>
|
||
|
|
To: intel-gfx@lists.freedesktop.org
|
||
|
|
|
||
|
|
We were using a stale pointer in the check which caused us to use CPU
|
||
|
|
attached DP params when we should have been using PCH attached params.
|
||
|
|
|
||
|
|
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
|
||
|
|
|
||
|
|
---
|
||
|
|
drivers/gpu/drm/i915/intel_display.c | 2 +-
|
||
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
|
||
|
|
index fe56cb3..28d58ef 100644
|
||
|
|
--- a/drivers/gpu/drm/i915/intel_display.c
|
||
|
|
+++ b/drivers/gpu/drm/i915/intel_display.c
|
||
|
|
@@ -3949,7 +3949,7 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
|
||
|
|
int lane = 0, link_bw, bpp;
|
||
|
|
/* CPU eDP doesn't require FDI link, so just set DP M/N
|
||
|
|
according to current link config */
|
||
|
|
- if (has_edp_encoder && !intel_encoder_is_pch_edp(&encoder->base)) {
|
||
|
|
+ if (has_edp_encoder && !intel_encoder_is_pch_edp(&has_edp_encoder->base)) {
|
||
|
|
target_clock = mode->clock;
|
||
|
|
intel_edp_link_config(has_edp_encoder,
|
||
|
|
&lane, &link_bw);
|