From 6bdb333610f43b59a2245d299a302300c992c764 Mon Sep 17 00:00:00 2001 From: mikeeq Date: Tue, 17 Jan 2023 11:05:20 +0100 Subject: [PATCH] Rebase 7001 patch against latest v6.1.6 --- ...915-fbdev-Discard-BIOS-framebuffers-exceeding-h.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/7001-drm-i915-fbdev-Discard-BIOS-framebuffers-exceeding-h.patch b/7001-drm-i915-fbdev-Discard-BIOS-framebuffers-exceeding-h.patch index 5ea1736..4e5d35c 100644 --- a/7001-drm-i915-fbdev-Discard-BIOS-framebuffers-exceeding-h.patch +++ b/7001-drm-i915-fbdev-Discard-BIOS-framebuffers-exceeding-h.patch @@ -11,11 +11,11 @@ Signed-off-by: Ashish Arora 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 adc3a81be..0a64184df 100644 +index 112aa04..8fb8bcc 100644 --- a/drivers/gpu/drm/i915/display/intel_fbdev.c +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c -@@ -194,10 +194,10 @@ static int intelfb_create(struct drm_fb_helper *helper, - int ret; +@@ -217,10 +217,10 @@ static int intelfb_create(struct drm_fb_helper *helper, + return ret; if (intel_fb && - (sizes->fb_width > intel_fb->base.width || @@ -29,4 +29,5 @@ index adc3a81be..0a64184df 100644 intel_fb->base.width, intel_fb->base.height, sizes->fb_width, sizes->fb_height); -- -2.25.1 +1.8.3.1 +