Change to patch versions being sent to upstream

Also remove provides apple-bce, as it was causing conflicts.
This commit is contained in:
Redecorating
2022-01-13 22:33:29 +11:00
parent fe7452e9da
commit c5a24ce205
6 changed files with 104 additions and 87 deletions
@@ -1,40 +1,32 @@
From 155bb242ee7f4e177386fbdec565db6d4a173d5e Mon Sep 17 00:00:00 2001
From: Aun-Ali Zaidi <admin@kodeit.net>
Date: Wed, 16 Sep 2020 18:31:10 -0500
Subject: [PATCH] drm/i915/fbdev: Discard BIOS framebuffers exceeding hardware
supported size
From: Ashish Arora <ashisharora.linux@outlook.com>
Subject: Re: [PATCH] drm/i915: Discard large BIOS framebuffers causing display corruption.
Date: Sat, 08 Jan 2022 21:43:18 +1100
On certain devices with high-DPI panels, the BIOS supplied framebuffer is larger
than what is physically supported by the panel, resulting in overscan. A previous
check introduced with edd586fe ("drm/i915: Discard BIOS framebuffers too small to
accommodate chosen mode"), handles the lower bound case. We extend that check
to include the upper bound case.
On certain 4k panels, the BIOS framebuffer is larger than what panel
requires causing display corruption. Introduce a check for the same.
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
Signed-off-by: Ashish Arora <ashisharora.linux@outlook.com>
---
drivers/gpu/drm/i915/display/intel_fbdev.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_fbdev.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
index bd39eb6a21b8..1949526cbe20 100644
index adc3a81be..0a64184df 100644
--- a/drivers/gpu/drm/i915/display/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
@@ -181,10 +181,12 @@ static int intelfb_create(struct drm_fb_helper *helper,
@@ -194,10 +194,10 @@ static int intelfb_create(struct drm_fb_helper *helper,
int ret;
if (intel_fb &&
- (sizes->fb_width > intel_fb->base.width ||
- sizes->fb_height > intel_fb->base.height)) {
+ ((sizes->fb_width > intel_fb->base.width ||
+ sizes->fb_height > intel_fb->base.height) ||
+ (sizes->fb_width < intel_fb->base.width ||
+ sizes->fb_height < intel_fb->base.height))) {
+ (sizes->fb_width != intel_fb->base.width ||
+ sizes->fb_height != intel_fb->base.height)) {
drm_dbg_kms(&dev_priv->drm,
- "BIOS fb too small (%dx%d), we require (%dx%d),"
+ "BIOS fb invalid size (%dx%d), we require (%dx%d),"
+ "BIOS fb not valid (%dx%d), we require (%dx%d),"
" releasing it\n",
intel_fb->base.width, intel_fb->base.height,
sizes->fb_width, sizes->fb_height);
--
2.28.0
2.25.1