[arch-commits] Commit in linux-lts/trunk (3 files)
Christian Hesse
eworm at archlinux.org
Mon May 28 10:46:47 UTC 2018
Date: Monday, May 28, 2018 @ 10:46:47
Author: eworm
Revision: 325070
upgpkg: linux-lts 4.14.44-1
* new upstream release
* use upstream i915 fix
Added:
linux-lts/trunk/0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
Modified:
linux-lts/trunk/PKGBUILD
Deleted:
linux-lts/trunk/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
-----------------------------------------------------------------+
0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch | 42 -
0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch | 230 ++++++++++
PKGBUILD | 10
3 files changed, 235 insertions(+), 47 deletions(-)
Deleted: 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
===================================================================
--- 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch 2018-05-28 07:45:19 UTC (rev 325069)
+++ 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch 2018-05-28 10:46:47 UTC (rev 325070)
@@ -1,42 +0,0 @@
-From e722c8d112f0aa9621d7d4da5223cfc7aeb45e88 Mon Sep 17 00:00:00 2001
-Message-Id: <e722c8d112f0aa9621d7d4da5223cfc7aeb45e88.1516188238.git.jan.steffens at gmail.com>
-In-Reply-To: <4e54373158caa50df5402fdd3db1794c5394026b.1516188238.git.jan.steffens at gmail.com>
-References: <4e54373158caa50df5402fdd3db1794c5394026b.1516188238.git.jan.steffens at gmail.com>
-From: Jim Bride <jim.bride at linux.intel.com>
-Date: Mon, 6 Nov 2017 13:38:57 -0800
-Subject: [PATCH 4/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 <david.weinehall at linux.intel.com>
-Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
-Signed-off-by: Jim Bride <jim.bride at 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 09f274419eea..838cee312e8e 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
-
Added: 0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
===================================================================
--- 0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch (rev 0)
+++ 0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch 2018-05-28 10:46:47 UTC (rev 325070)
@@ -0,0 +1,230 @@
+From 2a620025cea05fd4fc3bbf840b67df35e5ecbb8a Mon Sep 17 00:00:00 2001
+From: Jani Nikula <jani.nikula at intel.com>
+Date: Wed, 16 May 2018 11:01:10 +0300
+Subject: [PATCH] Revert "drm/i915/edp: Allow alternate fixed mode for eDP
+ if available."
+
+This reverts commit dc911f5bd8aacfcf8aabd5c26c88e04c837a938e.
+
+Per the report, no matter what display mode you select with xrandr, the
+i915 driver will always select the alternate fixed mode. For the
+reporter this means that the display will always run at 40Hz which is
+quite annoying. This may be due to the mode comparison.
+
+But there are some other potential issues. The choice of alt_fixed_mode
+seems dubious. It's the first non-preferred mode, but there are no
+guarantees that the only difference would be refresh rate. Similarly,
+there may be more than one preferred mode in the probed modes list, and
+the commit changes the preferred mode selection to choose the last one
+on the list instead of the first.
+
+(Note that the probed modes list is the raw, unfiltered, unsorted list
+of modes from drm_add_edid_modes(), not the pretty result after a
+drm_helper_probe_single_connector_modes() call.)
+
+Finally, we already have eerily similar code in place to find the
+downclock mode for DRRS that seems like could be reused here.
+
+Back to the drawing board.
+
+Note: This is a hand-crafted revert due to conflicts. If it fails to
+backport, please just try reverting the original commit directly.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105469
+Reported-by: Rune Petersen <rune at megahurts.dk>
+Reported-by: Mark Spencer <n7u4722r35 at ynzlx.anonbox.net>
+Fixes: dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for eDP if available.")
+Cc: Clint Taylor <clinton.a.taylor at intel.com>
+Cc: David Weinehall <david.weinehall at linux.intel.com>
+Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
+Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
+Cc: Jani Nikula <jani.nikula at intel.com>
+Cc: Chris Wilson <chris at chris-wilson.co.uk>
+Cc: Jim Bride <jim.bride at linux.intel.com>
+Cc: Jani Nikula <jani.nikula at linux.intel.com>
+Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
+Cc: intel-gfx at lists.freedesktop.org
+Cc: <stable at vger.kernel.org> # v4.14+
+Signed-off-by: Jani Nikula <jani.nikula at intel.com>
+Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan at intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20180516080110.22770-1-jani.nikula@intel.com
+---
+ drivers/gpu/drm/i915/intel_dp.c | 38 ++++--------------------------
+ drivers/gpu/drm/i915/intel_drv.h | 2 --
+ drivers/gpu/drm/i915/intel_dsi.c | 2 +-
+ drivers/gpu/drm/i915/intel_dvo.c | 2 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 3 +--
+ drivers/gpu/drm/i915/intel_panel.c | 6 -----
+ 6 files changed, 8 insertions(+), 45 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
+index 76cf68745870..0e6be6d521fd 100644
+--- a/drivers/gpu/drm/i915/intel_dp.c
++++ b/drivers/gpu/drm/i915/intel_dp.c
+@@ -1619,23 +1619,6 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp,
+ return bpp;
+ }
+
+-static bool intel_edp_compare_alt_mode(struct drm_display_mode *m1,
+- struct drm_display_mode *m2)
+-{
+- bool bres = false;
+-
+- if (m1 && m2)
+- bres = (m1->hdisplay == m2->hdisplay &&
+- m1->hsync_start == m2->hsync_start &&
+- m1->hsync_end == m2->hsync_end &&
+- m1->htotal == m2->htotal &&
+- m1->vdisplay == m2->vdisplay &&
+- m1->vsync_start == m2->vsync_start &&
+- m1->vsync_end == m2->vsync_end &&
+- m1->vtotal == m2->vtotal);
+- return bres;
+-}
+-
+ bool
+ intel_dp_compute_config(struct intel_encoder *encoder,
+ struct intel_crtc_state *pipe_config,
+@@ -1682,16 +1665,8 @@ intel_dp_compute_config(struct intel_encoder *encoder,
+ pipe_config->has_audio = intel_conn_state->force_audio == HDMI_AUDIO_ON;
+
+ if (is_edp(intel_dp) && intel_connector->panel.fixed_mode) {
+- struct drm_display_mode *panel_mode =
+- intel_connector->panel.alt_fixed_mode;
+- struct drm_display_mode *req_mode = &pipe_config->base.mode;
+-
+- if (!intel_edp_compare_alt_mode(req_mode, panel_mode))
+- panel_mode = intel_connector->panel.fixed_mode;
+-
+- drm_mode_debug_printmodeline(panel_mode);
+-
+- intel_fixed_panel_mode(panel_mode, adjusted_mode);
++ intel_fixed_panel_mode(intel_connector->panel.fixed_mode,
++ adjusted_mode);
+
+ if (INTEL_GEN(dev_priv) >= 9) {
+ int ret;
+@@ -5832,7 +5807,6 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
+ struct drm_device *dev = intel_encoder->base.dev;
+ struct drm_i915_private *dev_priv = to_i915(dev);
+ struct drm_display_mode *fixed_mode = NULL;
+- struct drm_display_mode *alt_fixed_mode = NULL;
+ struct drm_display_mode *downclock_mode = NULL;
+ bool has_dpcd;
+ struct drm_display_mode *scan;
+@@ -5888,14 +5862,13 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
+ }
+ intel_connector->edid = edid;
+
+- /* prefer fixed mode from EDID if available, save an alt mode also */
++ /* prefer fixed mode from EDID if available */
+ list_for_each_entry(scan, &connector->probed_modes, head) {
+ if ((scan->type & DRM_MODE_TYPE_PREFERRED)) {
+ fixed_mode = drm_mode_duplicate(dev, scan);
+ downclock_mode = intel_dp_drrs_init(
+ intel_connector, fixed_mode);
+- } else if (!alt_fixed_mode) {
+- alt_fixed_mode = drm_mode_duplicate(dev, scan);
++ break;
+ }
+ }
+
+@@ -5932,8 +5905,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
+ pipe_name(pipe));
+ }
+
+- intel_panel_init(&intel_connector->panel, fixed_mode, alt_fixed_mode,
+- downclock_mode);
++ intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
+ intel_connector->panel.backlight.power = intel_edp_backlight_power;
+ intel_panel_setup_backlight(connector, pipe);
+
+diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
+index 589905aab185..491618476ef0 100644
+--- a/drivers/gpu/drm/i915/intel_drv.h
++++ b/drivers/gpu/drm/i915/intel_drv.h
+@@ -265,7 +265,6 @@ struct intel_encoder {
+
+ struct intel_panel {
+ struct drm_display_mode *fixed_mode;
+- struct drm_display_mode *alt_fixed_mode;
+ struct drm_display_mode *downclock_mode;
+
+ /* backlight */
+@@ -1679,7 +1678,6 @@ void intel_overlay_reset(struct drm_i915_private *dev_priv);
+ /* intel_panel.c */
+ int intel_panel_init(struct intel_panel *panel,
+ struct drm_display_mode *fixed_mode,
+- struct drm_display_mode *alt_fixed_mode,
+ struct drm_display_mode *downclock_mode);
+ void intel_panel_fini(struct intel_panel *panel);
+ void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode,
+diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
+index 7442891762be..30b9432abcb1 100644
+--- a/drivers/gpu/drm/i915/intel_dsi.c
++++ b/drivers/gpu/drm/i915/intel_dsi.c
+@@ -1838,7 +1838,7 @@ void intel_dsi_init(struct drm_i915_private *dev_priv)
+ connector->display_info.width_mm = fixed_mode->width_mm;
+ connector->display_info.height_mm = fixed_mode->height_mm;
+
+- intel_panel_init(&intel_connector->panel, fixed_mode, NULL, NULL);
++ intel_panel_init(&intel_connector->panel, fixed_mode, NULL);
+ intel_panel_setup_backlight(connector, INVALID_PIPE);
+
+ intel_dsi_add_properties(intel_connector);
+diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
+index c0a027274c06..baf369d2de30 100644
+--- a/drivers/gpu/drm/i915/intel_dvo.c
++++ b/drivers/gpu/drm/i915/intel_dvo.c
+@@ -552,7 +552,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv)
+ */
+ intel_panel_init(&intel_connector->panel,
+ intel_dvo_get_current_mode(connector),
+- NULL, NULL);
++ NULL);
+ intel_dvo->panel_wants_dither = true;
+ }
+
+diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
+index 240308f1b6dd..d3a1956dfa84 100644
+--- a/drivers/gpu/drm/i915/intel_lvds.c
++++ b/drivers/gpu/drm/i915/intel_lvds.c
+@@ -1139,8 +1139,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
+ out:
+ mutex_unlock(&dev->mode_config.mutex);
+
+- intel_panel_init(&intel_connector->panel, fixed_mode, NULL,
+- downclock_mode);
++ intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
+ intel_panel_setup_backlight(connector, INVALID_PIPE);
+
+ lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder);
+diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
+index 3b1c5d783ee7..046086605d1e 100644
+--- a/drivers/gpu/drm/i915/intel_panel.c
++++ b/drivers/gpu/drm/i915/intel_panel.c
+@@ -1924,13 +1924,11 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel)
+
+ int intel_panel_init(struct intel_panel *panel,
+ struct drm_display_mode *fixed_mode,
+- struct drm_display_mode *alt_fixed_mode,
+ struct drm_display_mode *downclock_mode)
+ {
+ intel_panel_init_backlight_funcs(panel);
+
+ panel->fixed_mode = fixed_mode;
+- panel->alt_fixed_mode = alt_fixed_mode;
+ panel->downclock_mode = downclock_mode;
+
+ return 0;
+@@ -1944,10 +1942,6 @@ void intel_panel_fini(struct intel_panel *panel)
+ if (panel->fixed_mode)
+ drm_mode_destroy(intel_connector->base.dev, panel->fixed_mode);
+
+- if (panel->alt_fixed_mode)
+- drm_mode_destroy(intel_connector->base.dev,
+- panel->alt_fixed_mode);
+-
+ if (panel->downclock_mode)
+ drm_mode_destroy(intel_connector->base.dev,
+ panel->downclock_mode);
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-28 07:45:19 UTC (rev 325069)
+++ PKGBUILD 2018-05-28 10:46:47 UTC (rev 325070)
@@ -4,7 +4,7 @@
pkgbase=linux-lts
#pkgbase=linux-lts-custom
_srcname=linux-4.14
-pkgver=4.14.41
+pkgver=4.14.44
pkgrel=1
arch=('x86_64')
url="https://www.kernel.org/"
@@ -18,7 +18,7 @@
'90-linux.hook' # pacman hook for initramfs regeneration
'linux-lts.preset' # standard config files for mkinitcpio ramdisk
0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
- 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch)
+ 0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch)
validpgpkeys=('ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds <torvalds at linux-foundation.org>
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman (Linux kernel stable release signing key) <greg at kroah.com>
)
@@ -25,7 +25,7 @@
# https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7'
'SKIP'
- '9899039be6a66e98272120c4c6d50f4029a6b4f9cc95e5ca3555cff513a7581c'
+ '5f262dec41dc6e792123e3dc1f1c5a8dcb8d31629a874559540bf742aa8cc86f'
'SKIP'
'c645053c4525a1a70d5c10b52257ac136da7e9059b6a4a566a857a3d42046426'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
@@ -32,7 +32,7 @@
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
'36b1118c8dedadc4851150ddd4eb07b1c58ac5bbf3022cc2501a27c2b476da98'
- '6364edabad4182dcf148ae7c14d8f45d61037d4539e76486f978f1af3a090794')
+ 'b6c56ff2dffebe164941ac3428351e158c9c059e884057ecfc215eeea12e76eb')
_kernelname=${pkgbase#linux}
@@ -52,7 +52,7 @@
patch -Np1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
# https://bugs.archlinux.org/task/56711
- patch -Np1 -i ../0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
+ patch -Np1 -i ../0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
cp -Tf ../config .config
More information about the arch-commits
mailing list