diff options
| author | Cyano Hao | 2018-04-04 21:20:26 +0800 |
|---|---|---|
| committer | Cyano Hao | 2018-04-04 21:20:26 +0800 |
| commit | 84b366f414a26cc7abcd53fceee13df012076c12 (patch) | |
| tree | 0c22fee59bfaeb3511578c7781fe7ea34418d281 /0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch | |
| parent | 49cb4b6d3bfda9763040500c2308a9b3d07a6c51 (diff) | |
| download | aur-84b366f414a26cc7abcd53fceee13df012076c12.tar.gz | |
update to 4.15.14, merge config from Arch Linux 32 project
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.patch | 42 |
1 files changed, 42 insertions, 0 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 new file mode 100644 index 000000000000..2383c31fddd9 --- /dev/null +++ b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch @@ -0,0 +1,42 @@ +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: 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 + 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 add4b2434aa3..14a8bef9fdfe 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, + 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.16.2 + |