From 239758bb90b89bf33489e3885ab701d0f513b201 Mon Sep 17 00:00:00 2001 From: David P Date: Tue, 18 Sep 2018 22:48:56 -0300 Subject: upgpkg: kernels/linux-libre-rt 4.14.69_gnu.rt43-1 Signed-off-by: David P --- ...p-Only-use-the-alternate-fixed-mode-if-it.patch | 42 ---- ...i915-edp-Allow-alternate-fixed-mode-for-e.patch | 230 +++++++++++++++++++++ kernels/linux-libre-rt/PKGBUILD | 21 +- .../fix-get_irq_regs-implicit-declaration.patch | 36 ---- 4 files changed, 239 insertions(+), 90 deletions(-) delete mode 100644 kernels/linux-libre-rt/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch create mode 100644 kernels/linux-libre-rt/0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch delete mode 100644 kernels/linux-libre-rt/fix-get_irq_regs-implicit-declaration.patch (limited to 'kernels') diff --git a/kernels/linux-libre-rt/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch b/kernels/linux-libre-rt/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch deleted file mode 100644 index f77c9b5c1..000000000 --- a/kernels/linux-libre-rt/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e722c8d112f0aa9621d7d4da5223cfc7aeb45e88 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <4e54373158caa50df5402fdd3db1794c5394026b.1516188238.git.jan.steffens@gmail.com> -References: <4e54373158caa50df5402fdd3db1794c5394026b.1516188238.git.jan.steffens@gmail.com> -From: Jim Bride -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 -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 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 - diff --git a/kernels/linux-libre-rt/0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch b/kernels/linux-libre-rt/0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch new file mode 100644 index 000000000..7665ca9e1 --- /dev/null +++ b/kernels/linux-libre-rt/0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch @@ -0,0 +1,230 @@ +From 2a620025cea05fd4fc3bbf840b67df35e5ecbb8a Mon Sep 17 00:00:00 2001 +From: Jani Nikula +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 +Reported-by: Mark Spencer +Fixes: dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for eDP if available.") +Cc: Clint Taylor +Cc: David Weinehall +Cc: Rodrigo Vivi +Cc: Paulo Zanoni +Cc: Jani Nikula +Cc: Chris Wilson +Cc: Jim Bride +Cc: Jani Nikula +Cc: Joonas Lahtinen +Cc: intel-gfx@lists.freedesktop.org +Cc: # v4.14+ +Signed-off-by: Jani Nikula +Reviewed-by: Dhinakaran Pandiyan +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); diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 0d391eb9a..717aa2836 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -11,9 +11,9 @@ pkgbase=linux-libre-rt _srcbasever=4.14-gnu -_srcver=4.14.63-gnu +_srcver=4.14.69-gnu _rtbasever=4.14 -_rtpatchver=rt40 +_rtpatchver=rt43 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=() # '%' gets replaced with _kernelname @@ -23,7 +23,7 @@ _srcname=linux-${_srcbasever%-*} _archpkgver=${_srcver%-*}_${_rtpatchver} pkgver=${_srcver//-/_}.${_rtpatchver} pkgrel=1 -rcnrel=armv7-x6 +rcnrel=armv7-x9 arch=('x86_64' 'i686' 'armv7h') url="https://linux-libre.fsfla.org/" license=('GPL2') @@ -63,8 +63,7 @@ source=( '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch' '0002-fix-Atmel-maXTouch-touchscreen-support.patch' '0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch' - '0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch' - 'fix-get_irq_regs-implicit-declaration.patch' + '0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch' ) validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva @@ -74,9 +73,9 @@ validpgpkeys=( ) sha512sums=('0d4b0b8ec1ffc39c59295adf56f6a2cccf77cad56d8a8bf8072624bbb52ba3e684147ebed91d1528d2685423dd784c5fca0f3650f874f2b93cfc6b7689b9a87f' 'SKIP' - 'eb10220130f8cf8e24718db545e45eed2b54930d7dfb44a9ad2a445b1ec5060112f6f962257c16844499790b8cf57bcc19249a57d2e48df122a265cc2b59b4c2' + '2010ac559bd306eda9b37d6399e601a818b57cc546f6af81bd107e1ee02d8f52afdd0c4e2967a46fc8119047c93a985a3e8dc51eb7d7735205c6fcaca1f73db3' 'SKIP' - '667f872df8ee8cb86fb923500115c23efce3329ddba38875c13e4a02e793eae7b73215dfa7c8fb9efdca7e3e2fc1843801ead5f6947cea6234be454e4b7ec856' + 'e5b7344f2dc782f9084cde1f0714536e8a4dfa451df31afb16c905be71efaad762924403e8fd555e49d074c3048820d2d52e2dbc47b7da380506e69656db2a11' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -109,8 +108,7 @@ sha512sums=('0d4b0b8ec1ffc39c59295adf56f6a2cccf77cad56d8a8bf8072624bbb52ba3e6841 '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' '485f37aca7793cee2361e126bc619e5bfd1737bff484b06bbba76cd326f3845c4d96c17bb9a56623a653b7b7062a698975d6a7f019f5c1a3eb9faf9b352d73f2' - 'e8229b8979ab287d9ad2cac137f2ba349bd43fd0fc09ad19239ea8e3d0d9571977a8296d3814887d7c15f61431f91194851b4a1af5c61ed416faec8283ce3206' - 'a49a10e36c788144b4c10596b220f64f1f8f868b97e50f890af9a6be826a12646182cece3971a490c8450d291b196decb40cb865f5f75d3d5a7af3c77f114fcb') + 'f3b63304f2c3ab9bfb4d0a697e1ec9bb6efbb1a458e8dad7b95a7fc9e1afd4899a540a46b4db10efb0c496c01c3408d32936fdd9a46de33f992e36ee4d42c290') _kernelname=${pkgbase#linux-libre} _replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}") @@ -133,7 +131,6 @@ prepare() { # add realtime patch patch -p1 -i ../patch-${_srcver%-*}-${_rtpatchver}.patch - patch -p1 -i ../fix-get_irq_regs-implicit-declaration.patch rm localversion-rt if [ "${CARCH}" = "armv7h" ]; then @@ -173,7 +170,7 @@ prepare() { 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 # maintain the TTY over USB disconnects # http://www.coreboot.org/EHCI_Gadget_Debug @@ -223,7 +220,7 @@ build() { } _package() { -pkgdesc="The ${pkgbase^} kernel and modules with realtime preemption" + pkgdesc="The ${pkgbase^} kernel and modules with realtime preemption" [ "${pkgbase}" = "linux-libre" ] && groups=('base' 'base-openrc') depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') diff --git a/kernels/linux-libre-rt/fix-get_irq_regs-implicit-declaration.patch b/kernels/linux-libre-rt/fix-get_irq_regs-implicit-declaration.patch deleted file mode 100644 index 88003b189..000000000 --- a/kernels/linux-libre-rt/fix-get_irq_regs-implicit-declaration.patch +++ /dev/null @@ -1,36 +0,0 @@ ------------------- - -From: Sebastian Andrzej Siewior - -[ Upstream commit b9fcc1867cc7921bb8441be327ed58461ed12255 ] - -On !RT the header file get_irq_regs() gets pulled in via other header files. On -RT it does not and the build fails: - - drivers/hv/vmbus_drv.c:975 implicit declaration of function '˜get_irq_regs'™ [-Werror=implicit-function-declaration] - drivers/hv/hv.c:115 implicit declaration of function '˜get_irq_regs'™ [-Werror=implicit-function-declaration] - -Add the header file for get_irq_regs() in a common header so it used by -vmbus_drv.c by hv.c for their get_irq_regs() usage. - -Reported-by: Bernhard Landauer -Reported-by: Ralf Ramsauer -Signed-off-by: Sebastian Andrzej Siewior -Signed-off-by: Steven Rostedt (VMware) ---- - drivers/hv/hyperv_vmbus.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h -index 49569f8fe038..a3608cd52805 100644 ---- a/drivers/hv/hyperv_vmbus.h -+++ b/drivers/hv/hyperv_vmbus.h -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - /* - * Timeout for services such as KVP and fcopy. - -- cgit v1.2.2