summarylogtreecommitdiffstats
path: root/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
diff options
context:
space:
mode:
authorTony Lambiris2018-04-17 23:58:06 -0400
committerTony Lambiris2018-04-17 23:58:06 -0400
commit9932208fbb2c169329c5539f996f641f065705d3 (patch)
treee5f0e21d7d157621918f4d2bccc4e84b3ef3807c /0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
parent2339271acfa5e804b98bb64bd5bac2340bc79927 (diff)
downloadaur-9932208fbb2c169329c5539f996f641f065705d3.tar.gz
Sync with arch
Diffstat (limited to '0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch')
-rw-r--r--0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
index 2383c31fddd9..259f372513de 100644
--- a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
+++ b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
@@ -1,10 +1,10 @@
-From 704e31424615c87ad82424a9b09a452d762daed0 Mon Sep 17 00:00:00 2001
-Message-Id: <704e31424615c87ad82424a9b09a452d762daed0.1520639721.git.jan.steffens@gmail.com>
-In-Reply-To: <188720e92122385994143a06cb16a930053eb503.1520639721.git.jan.steffens@gmail.com>
-References: <188720e92122385994143a06cb16a930053eb503.1520639721.git.jan.steffens@gmail.com>
+From 1ab88f114ddb0f614118c330196af3024f88630c Mon Sep 17 00:00:00 2001
+Message-Id: <1ab88f114ddb0f614118c330196af3024f88630c.1523990130.git.jan.steffens@gmail.com>
+In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
+References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523990130.git.jan.steffens@gmail.com>
From: Jim Bride <jim.bride@linux.intel.com>
Date: Mon, 6 Nov 2017 13:38:57 -0800
-Subject: [PATCH 2/2] drm/i915/edp: Only use the alternate fixed mode if it's
+Subject: [PATCH 2/7] 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
@@ -24,10 +24,10 @@ Signed-off-by: Jim Bride <jim.bride@linux.intel.com>
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 add4b2434aa3..14a8bef9fdfe 100644
+index a29868cd30c7..b6d07b615b12 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -1616,7 +1616,8 @@ static bool intel_edp_compare_alt_mode(struct drm_display_mode *m1,
+@@ -1597,7 +1597,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 &&
@@ -38,5 +38,5 @@ index add4b2434aa3..14a8bef9fdfe 100644
}
--
-2.16.2
+2.17.0