[PATCH] drm/i915: check eDP encoder correctly when setting modes

[PATCH] drm/i915: check eDP encoder correctly when setting modes

[Jesse Barnes]

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);
-- 
1.7.0.4

Re: [PATCH] drm/i915: check eDP encoder correctly when setting modes

[Chris Wilson]

On Tue,  4 Jan 2011 10:46:49 -0800, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> 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.

This is a nice fix. I harvested a couple of tested-bys and pushed to
-fixes.

Let's see if we can get it to Dave and Linus in time for .37.
Thanks,
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre