diff options
Diffstat (limited to '0001-Revert-drm-i915-fbdev-Actually-configure-untiled-dis.patch')
| -rw-r--r-- | 0001-Revert-drm-i915-fbdev-Actually-configure-untiled-dis.patch | 60 |
1 files changed, 0 insertions, 60 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 deleted file mode 100644 index b6fa0783c..000000000 --- a/0001-Revert-drm-i915-fbdev-Actually-configure-untiled-dis.patch +++ /dev/null @@ -1,60 +0,0 @@ -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 - |