[kernel] drm_i915-check-eDP-encoder-correctly-when-setting-modes.patch

[Kyle McMartin]

commit e2a5d65ab5e655ed3e59540459868b6f7a67f8fa
Author: Kyle McMartin <kyle at redhat.com>
Date:   Fri Jan 7 09:39:48 2011 -0500

    drm_i915-check-eDP-encoder-correctly-when-setting-modes.patch

 ...-eDP-encoder-correctly-when-setting-modes.patch |   33 ++++++++++++++++++++
 kernel.spec                                        |    8 ++++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/drm_i915-check-eDP-encoder-correctly-when-setting-modes.patch b/drm_i915-check-eDP-encoder-correctly-when-setting-modes.patch
new file mode 100644
index 0000000..9f6800a
--- /dev/null
+++ b/drm_i915-check-eDP-encoder-correctly-when-setting-modes.patch
@@ -0,0 +1,33 @@
+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 at virtuousgeek.org>
+X-Patchwork-Id: 451441
+Message-Id: <1294166809-3316-1-git-send-email-jbarnes at virtuousgeek.org>
+To: intel-gfx at 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 at 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);
diff --git a/kernel.spec b/kernel.spec
index 4357e23..510a596 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be prepended with "0.", so
 # for example a 3 here will become 0.3
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -663,6 +663,7 @@ Patch1824: drm-intel-next.patch
 # make sure the lvds comes back on lid open
 Patch1825: drm-intel-make-lvds-work.patch
 Patch1826: drm-intel-edp-fixes.patch
+Patch1827: drm_i915-check-eDP-encoder-correctly-when-setting-modes.patch
 
 Patch1900: linux-2.6-intel-iommu-igfx.patch
 
@@ -1279,6 +1280,7 @@ ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-intel-make-lvds-work.patch
 ApplyPatch linux-2.6-intel-iommu-igfx.patch
 ApplyPatch drm-intel-edp-fixes.patch
+ApplyPatch drm_i915-check-eDP-encoder-correctly-when-setting-modes.patch
 
 # linux1394 git patches
 #ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1957,6 +1959,10 @@ fi
 #                 ||     ||
 
 %changelog
+* Fri Jan 07 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.37-2
+- drm_i915-check-eDP-encoder-correctly-when-setting-modes.patch reported to
+  fix HP/Sony eDP issues by adamw and airlied.
+
 * Wed Jan 05 2011 Dennis Gilmore <dennis at ausil.us> 
 - build sparc headers on sparcv9