Rebased i915 patch to 5.8

7001-drm-i915-fbdev-Discard-BIOS-framebuffers-exceeding-h.patch

@@ -1,4 +1,4 @@
-From 506daf9b9e8b62789a2b1ca73e22a80b345aad0a Mon Sep 17 00:00:00 2001
+From 155bb242ee7f4e177386fbdec565db6d4a173d5e Mon Sep 17 00:00:00 2001
 From: Aun-Ali Zaidi <[email protected]>
 Date: Wed, 16 Sep 2020 18:31:10 -0500
 Subject: [PATCH] drm/i915/fbdev: Discard BIOS framebuffers exceeding hardware
@@ -12,25 +12,29 @@ to include the upper bound case.
 
 Signed-off-by: Aun-Ali Zaidi <[email protected]>
 ---
- drivers/gpu/drm/i915/display/intel_fbdev.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ drivers/gpu/drm/i915/display/intel_fbdev.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
-index 3bc804212a99..fc385d067d2f 100644
+index bd39eb6a21b8..1949526cbe20 100644
 --- a/drivers/gpu/drm/i915/display/intel_fbdev.c
 +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
-@@ -182,8 +182,10 @@ static int intelfb_create(struct drm_fb_helper *helper,
+@@ -181,10 +181,12 @@ 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)) {
-- DRM_DEBUG_KMS("BIOS fb too small (%dx%d), we require (%dx%d),"
-+ DRM_DEBUG_KMS("BIOS fb invalid size (%dx%d), we require (%dx%d),"
- " releasing it\n",
- intel_fb->base.width, intel_fb->base.height,
- sizes->fb_width, sizes->fb_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),"
+ " releasing it\n",
+ intel_fb->base.width, intel_fb->base.height,
+ sizes->fb_width, sizes->fb_height);
 -- 
 2.28.0
 

PKGBUILD

@@ -109,7 +109,7 @@ sha256sums=('e7f75186aa0642114af8f19d99559937300ca27acaf7451b36d4f9b0f85cf1f5'
  '0318952f59efdce4dc72703adc764940db6fdff184960c27a23a80c3413d8a60'
  'e632f2959efca848fd28acb5e278cc476f8fb54d70ca95272b0a76add47e474e'
  'eb5134e6b7415528547120e661aa58d7125cc657e982c924989d7a63d253d85e'
- 'c00e29fc39848422049faa341134c236589a7f1c9654695fd19fd5d4f031c1b5'
+ '90a6012cdd8a64ede8e0bbaf7331960bd68f628e0973b65459188eb1ccb5b829'
  '8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c'
  '17f11a531e975f401449e5a0e230c596cdaff51c95a9e7b70bc7ce9455a1f0e1')
 prepare() {