1 files changed, 39 insertions, 0 deletions
diff --git a/libre/linux-libre-hardened/drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch b/libre/linux-libre-hardened/drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch
new file mode 100644
index 000000000..64212063a
--- /dev/null
+++ b/libre/linux-libre-hardened/drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch
@@ -0,0 +1,39 @@
+From e9b8250407ae73faa7ac543f7f260b4b2f34ebd8 Mon Sep 17 00:00:00 2001
+From: Jim Bride <jim.bride@linux.intel.com>
+Date: Mon, 6 Nov 2017 13:38:57 -0800
+Subject: [PATCH] drm/i915/edp: Only use the alternate fixed mode if it's asked
+ for
+
+In commit dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for
+eDP if available."), the patch allows for the use of an alternate fixed
+mode if it is available, but the patch was not ensuring that the only
+time the alternate mode is used is when it is specifically requested.
+This patch adds an additional comparison to intel_edp_compare_alt_mode
+to ensure that we only use the alternate mode if it is directly
+requested.
+
+Fixes: dc911f5bd8aac ("Allow alternate fixed mode for eDP if available.")
+Cc: David Weinehall <david.weinehall@linux.intel.com>
+Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Signed-off-by: Jim Bride <jim.bride@linux.intel.com>
+---
+ drivers/gpu/drm/i915/intel_dp.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
+index d27c014..8164c59 100644
+--- a/drivers/gpu/drm/i915/intel_dp.c
++++ b/drivers/gpu/drm/i915/intel_dp.c
+@@ -1621,7 +1621,8 @@ static bool intel_edp_compare_alt_mode(struct drm_display_mode *m1,
+ 			m1->vdisplay == m2->vdisplay &&
+ 			m1->vsync_start == m2->vsync_start &&
+ 			m1->vsync_end == m2->vsync_end &&
+-			m1->vtotal == m2->vtotal);
++			m1->vtotal == m2->vtotal &&
++			m1->vrefresh == m2->vrefresh);
+ 	return bres;
+ }
+ 
+-- 
+2.7.4
+