diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2019-03-05 13:02:36 -0600 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2019-03-05 13:02:36 -0600 |
commit | 61d31d33136db1c16cc6d7f5bc9041e89f22dd91 (patch) | |
tree | 01a0d6e0da65f9cd50978bce2fdd19a4425cd79e | |
parent | 33d460bef671c98f44124fc986c77eb8d19928d7 (diff) | |
download | kernel-61d31d33136db1c16cc6d7f5bc9041e89f22dd91.tar.gz kernel-61d31d33136db1c16cc6d7f5bc9041e89f22dd91.tar.xz kernel-61d31d33136db1c16cc6d7f5bc9041e89f22dd91.zip |
Linux v4.20.14
-rw-r--r-- | 0001-Revert-drm-i915-fbdev-Actually-configure-untiled-dis.patch | 60 | ||||
-rw-r--r-- | kernel.spec | 8 | ||||
-rw-r--r-- | sources | 2 |
3 files changed, 68 insertions, 2 deletions
diff --git a/0001-Revert-drm-i915-fbdev-Actually-configure-untiled-dis.patch b/0001-Revert-drm-i915-fbdev-Actually-configure-untiled-dis.patch new file mode 100644 index 000000000..b6fa0783c --- /dev/null +++ b/0001-Revert-drm-i915-fbdev-Actually-configure-untiled-dis.patch @@ -0,0 +1,60 @@ +From e90ac616e4b1d49ec9092086b0e10108df12157d Mon Sep 17 00:00:00 2001 +From: Fedora Kernel Team <kernel-team@fedoraproject.org> +Date: Tue, 5 Mar 2019 12:56:35 -0600 +Subject: [PATCH] Revert drm/i915/fbdev: Actually configure untiled displays + +--- + drivers/gpu/drm/i915/intel_fbdev.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c +index e0c02a9..9e2e998 100644 +--- a/drivers/gpu/drm/i915/intel_fbdev.c ++++ b/drivers/gpu/drm/i915/intel_fbdev.c +@@ -336,8 +336,8 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, + bool *enabled, int width, int height) + { + struct drm_i915_private *dev_priv = to_i915(fb_helper->dev); ++ unsigned long conn_configured, conn_seq, mask; + unsigned int count = min(fb_helper->connector_count, BITS_PER_LONG); +- unsigned long conn_configured, conn_seq; + int i, j; + bool *save_enabled; + bool fallback = true, ret = true; +@@ -355,9 +355,10 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, + drm_modeset_backoff(&ctx); + + memcpy(save_enabled, enabled, count); +- conn_seq = GENMASK(count - 1, 0); ++ mask = GENMASK(count - 1, 0); + conn_configured = 0; + retry: ++ conn_seq = conn_configured; + for (i = 0; i < count; i++) { + struct drm_fb_helper_connector *fb_conn; + struct drm_connector *connector; +@@ -370,8 +371,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, + if (conn_configured & BIT(i)) + continue; + +- /* First pass, only consider tiled connectors */ +- if (conn_seq == GENMASK(count - 1, 0) && !connector->has_tile) ++ if (conn_seq == 0 && !connector->has_tile) + continue; + + if (connector->status == connector_status_connected) +@@ -475,10 +475,8 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper, + conn_configured |= BIT(i); + } + +- if (conn_configured != conn_seq) { /* repeat until no more are found */ +- conn_seq = conn_configured; ++ if ((conn_configured & mask) != mask && conn_configured != conn_seq) + goto retry; +- } + + /* + * If the BIOS didn't enable everything it could, fall back to have the +-- +2.20.1 + diff --git a/kernel.spec b/kernel.spec index 9b9de9619..e839ad814 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 13 +%define stable_update 14 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -643,6 +643,9 @@ Patch510: CVE-2019-8980.patch # rhbz 1683382 Patch511: nfsv4.1-avoid-false-retries.patch +# https://bugs.freedesktop.org/show_bug.cgi?id=109806 +Patch512: 0001-Revert-drm-i915-fbdev-Actually-configure-untiled-dis.patch + # END OF PATCH DEFINITIONS %endif @@ -1914,6 +1917,9 @@ fi # # %changelog +* Tue Mar 05 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.14-200 +- Linux v4.20.14 + * Wed Feb 27 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.13-200 - Linux v4.20.13 - Fix for NFS issue (rhbz 1683382) @@ -1,2 +1,2 @@ SHA512 (linux-4.20.tar.xz) = e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4 -SHA512 (patch-4.20.13.xz) = 35e946071c985bc14643cfba7c717377921c71e89b0b4fa37792e176b4588953f582f426f3bf61bbe58c4f9c8869179829fd1956174ab743493098adbf6d9510 +SHA512 (patch-4.20.14.xz) = 2743963385f1a3ecac2a36978569bcea49df7db7d126aa37f807252eda419e3bba3b2444fab0c3e0a22da17d3adbd5b77e0637ccc025d54fe51b7cc6361d4db9 |