43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
|
From cf45be4971bdd769c09e2a11db483510cd0bcc5f Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <cf45be4971bdd769c09e2a11db483510cd0bcc5f.1515173964.git.jan.steffens@gmail.com>
|
||
|
|
In-Reply-To: <0b716bdb952b678d9bb5eb32198dbc82ec492df2.1515173964.git.jan.steffens@gmail.com>
|
||
|
|
References: <0b716bdb952b678d9bb5eb32198dbc82ec492df2.1515173964.git.jan.steffens@gmail.com>
|
||
|
|
From: Jim Bride <jim.bride@linux.intel.com>
|
||
|
|
Date: Mon, 6 Nov 2017 13:38:57 -0800
|
||
|
|
Subject: [PATCH 6/6] 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 09f274419eea1c74..838cee312e8e6978 100644
|
||
|
|
--- a/drivers/gpu/drm/i915/intel_dp.c
|
||
|
|
+++ b/drivers/gpu/drm/i915/intel_dp.c
|
||
|
|
@@ -1632,7 +1632,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.15.1
|
||
|
|
|