From c1ccfe11b06dfe619afcd8e05065b056c0dd8fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Thu, 17 Feb 2022 22:05:08 +0100 Subject: [PATCH] Adjust bootsplash patches for 5.15.y / 5.15.y (#3501) --- lib/compilation-prepare.sh | 2 + ...n-Avoid-cap-set-but-not-used-warning.patch | 45 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 patch/misc/bootsplash-5.16.y-0000-Revert-fbcon-Avoid-cap-set-but-not-used-warning.patch diff --git a/lib/compilation-prepare.sh b/lib/compilation-prepare.sh index 13df28af7a..2cec3eb204 100644 --- a/lib/compilation-prepare.sh +++ b/lib/compilation-prepare.sh @@ -111,11 +111,13 @@ compilation_prepare() display_alert "Adding" "Kernel splash file" "info" + process_patch_file "${SRC}/patch/misc/bootsplash-5.16.y-0000-Revert-fbcon-Avoid-cap-set-but-not-used-warning.patch" "applying" process_patch_file "${SRC}/patch/misc/bootsplash-5.16.y-0001-Revert-fbcon-Add-option-to-enable-legacy-hardware-ac.patch" "applying" if linux-version compare "${version}" ge 5.15; then process_patch_file "${SRC}/patch/misc/bootsplash-5.16.y-0002-Revert-vgacon-drop-unused-vga_init_done.patch" "applying" fi + process_patch_file "${SRC}/patch/misc/bootsplash-5.16.y-0003-Revert-vgacon-remove-software-scrollback-support.patch" "applying" process_patch_file "${SRC}/patch/misc/bootsplash-5.16.y-0004-Revert-drivers-video-fbcon-fix-NULL-dereference-in-f.patch" "applying" process_patch_file "${SRC}/patch/misc/bootsplash-5.16.y-0005-Revert-fbcon-remove-no-op-fbcon_set_origin.patch" "applying" diff --git a/patch/misc/bootsplash-5.16.y-0000-Revert-fbcon-Avoid-cap-set-but-not-used-warning.patch b/patch/misc/bootsplash-5.16.y-0000-Revert-fbcon-Avoid-cap-set-but-not-used-warning.patch new file mode 100644 index 0000000000..7657bde7f1 --- /dev/null +++ b/patch/misc/bootsplash-5.16.y-0000-Revert-fbcon-Avoid-cap-set-but-not-used-warning.patch @@ -0,0 +1,45 @@ +From 27517cde069da44a218ce13b5d46fee19c1bcc77 Mon Sep 17 00:00:00 2001 +From: Helge Deller +Date: Mon, 7 Feb 2022 16:59:31 +0100 +Subject: [PATCH] Revert "fbcon: Avoid 'cap' set but not used warning" + +This reverts commit 3523167d665852fc5f92971aefea8f3bd4e2f6fd. +--- + drivers/video/fbdev/core/fbcon.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c +index a53c1f6906f0..f7b7d35953e8 100644 +--- a/drivers/video/fbdev/core/fbcon.c ++++ b/drivers/video/fbdev/core/fbcon.c +@@ -1025,7 +1025,7 @@ static void fbcon_init(struct vc_data *vc, int init) + struct vc_data *svc = *default_mode; + struct fbcon_display *t, *p = &fb_display[vc->vc_num]; + int logo = 1, new_rows, new_cols, rows, cols; +- int ret; ++ int cap, ret; + + if (WARN_ON(info_idx == -1)) + return; +@@ -1034,6 +1034,7 @@ static void fbcon_init(struct vc_data *vc, int init) + con2fb_map[vc->vc_num] = info_idx; + + info = registered_fb[con2fb_map[vc->vc_num]]; ++ cap = info->flags; + + if (logo_shown < 0 && console_loglevel <= CONSOLE_LOGLEVEL_QUIET) + logo_shown = FBCON_LOGO_DONTSHOW; +@@ -1136,8 +1137,8 @@ static void fbcon_init(struct vc_data *vc, int init) + ops->graphics = 0; + + #ifdef CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION +- if ((info->flags & FBINFO_HWACCEL_COPYAREA) && +- !(info->flags & FBINFO_HWACCEL_DISABLED)) ++ if ((cap & FBINFO_HWACCEL_COPYAREA) && ++ !(cap & FBINFO_HWACCEL_DISABLED)) + p->scrollmode = SCROLL_MOVE; + else /* default to something safe */ + p->scrollmode = SCROLL_REDRAW; +-- +2.25.1 +