From 5cbcef251f3997a70ac62e9a971287b06b25f727 Mon Sep 17 00:00:00 2001 Message-Id: <5cbcef251f3997a70ac62e9a971287b06b25f727.1525091195.git.jan.steffens@gmail.com> In-Reply-To: <07043e7b2e94a711c7ffa6f72c6f50a73dccd86d.1525091195.git.jan.steffens@gmail.com> References: <07043e7b2e94a711c7ffa6f72c6f50a73dccd86d.1525091195.git.jan.steffens@gmail.com> From: Jim Bride Date: Mon, 6 Nov 2017 13:38:57 -0800 Subject: [PATCH 2/4] 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 Cc: Rodrigo Vivi Signed-off-by: Jim Bride --- 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 a29868cd30c7..b6d07b615b12 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -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 && - m1->vtotal == m2->vtotal); + m1->vtotal == m2->vtotal && + m1->vrefresh == m2->vrefresh); return bres; } -- 2.17.0