From 8afc4f109e62d5f34bc3f0d68bbe74effb366336 Mon Sep 17 00:00:00 2001 From: Gerben Jan Dijkman Date: Fri, 19 Aug 2022 02:15:30 +0200 Subject: [PATCH] Update kernel verion --- sys-kernel/pinephone-pro-sources/Manifest | 2 +- ...rt-fbcon-remove-soft-scrollback-code.patch | 100 +++++++++--------- .../files/0301-bootsplash.patch | 24 ++--- .../files/0302-bootsplash.patch | 14 +-- .../files/0310-bootsplash.patch | 18 ++-- .../files/0312-bootsplash.patch | 14 +-- ...ld => pinephone-pro-sources-5.19.2.ebuild} | 2 +- 7 files changed, 87 insertions(+), 87 deletions(-) rename sys-kernel/pinephone-pro-sources/{pinephone-pro-sources-5.19.0.ebuild => pinephone-pro-sources-5.19.2.ebuild} (98%) diff --git a/sys-kernel/pinephone-pro-sources/Manifest b/sys-kernel/pinephone-pro-sources/Manifest index 3a33b67..3e83580 100644 --- a/sys-kernel/pinephone-pro-sources/Manifest +++ b/sys-kernel/pinephone-pro-sources/Manifest @@ -1 +1 @@ -DIST orange-pi-5.19-20220802-0940.tar.gz 214990340 BLAKE2B 9bbadd06a8d160d716838d709f7ca6adb6143cb2205337940fb2d4607f0b806400cc77fb4abd36856844536b0a4ced92737658fc7af60d10f141a21116d66eed SHA512 04d46f6065a138d3b206937fada3990f823a1937c14812bada6512d04ebf1c7634cdea0a57611066bd2b4951a38c8e354b187bffe2ca738f2fe2a3f50d922dc2 +DIST orange-pi-5.19-20220818-0237.tar.gz 215037000 BLAKE2B 094bccfaee93cce251d422faaf283c9c2100caa6c0faaf222ea95dafa90a9691dd1ba395f0641f27a82689a0f5fa71e218ba3479b0a94753d570bd16289d7b77 SHA512 f7aa9f2f9d481bcd553563c8e287756e112a3b0062c30673d2072ffcd5c47e4dca3640b467a52bfd6227721baca8a71aa703cb9a23b66c2de4c9f6ca773695d7 diff --git a/sys-kernel/pinephone-pro-sources/files/0203-revert-fbcon-remove-soft-scrollback-code.patch b/sys-kernel/pinephone-pro-sources/files/0203-revert-fbcon-remove-soft-scrollback-code.patch index 4f97354..491fbe0 100644 --- a/sys-kernel/pinephone-pro-sources/files/0203-revert-fbcon-remove-soft-scrollback-code.patch +++ b/sys-kernel/pinephone-pro-sources/files/0203-revert-fbcon-remove-soft-scrollback-code.patch @@ -1,6 +1,6 @@ --- b/drivers/video/fbdev/core/fbcon.c +++ a/drivers/video/fbdev/core/fbcon.c -@@ -122,6 +122,12 @@ +@@ -124,6 +124,12 @@ static int logo_lines; /* logo_shown is an index to vc_cons when >= 0; otherwise follows FBCON_LOGO enums. */ static int logo_shown = FBCON_LOGO_CANSHOW; @@ -11,9 +11,9 @@ +static unsigned long softback_top, softback_end; +static int softback_lines; /* console mappings */ - static int first_fb_vc; - static int last_fb_vc = MAX_NR_CONSOLES - 1; -@@ -161,6 +167,8 @@ + static unsigned int first_fb_vc; + static unsigned int last_fb_vc = MAX_NR_CONSOLES - 1; +@@ -163,6 +169,8 @@ static int margin_color; static const struct consw fb_con; @@ -22,7 +22,7 @@ #define advance_row(p, delta) (unsigned short *)((unsigned long)(p) + (delta) * vc->vc_size_row) static int fbcon_set_origin(struct vc_data *); -@@ -365,6 +373,18 @@ +@@ -347,6 +355,18 @@ static int get_color(struct vc_data *vc, return color; } @@ -40,20 +40,21 @@ + static void fb_flashcursor(struct work_struct *work) { - struct fb_info *info = container_of(work, struct fb_info, queue); -@@ -394,7 +414,7 @@ + struct fbcon_ops *ops = container_of(work, struct fbcon_ops, cursor_work.work); +@@ -379,7 +399,7 @@ static void fb_flashcursor(struct work_s c = scr_readw((u16 *) vc->vc_pos); mode = (!ops->cursor_flash || ops->cursor_state.enable) ? CM_ERASE : CM_DRAW; -+ ops->cursor(vc, info, mode, softback_lines, get_color(vc, info, c, 1), - ops->cursor(vc, info, mode, 0, get_color(vc, info, c, 1), ++ ops->cursor(vc, info, mode, softback_lines, get_color(vc, info, c, 1), get_color(vc, info, c, 0)); console_unlock(); - } -@@ -451,7 +471,13 @@ + +@@ -419,7 +439,13 @@ static int __init fb_console_setup(char } if (!strncmp(options, "scrollback:", 11)) { +- pr_warn("Ignoring scrollback size option\n"); + options += 11; + if (*options) { + fbcon_softback_size = simple_strtoul(options, &options, 0); @@ -61,11 +62,10 @@ + fbcon_softback_size *= 1024; + } + } -- pr_warn("Ignoring scrollback size option\n"); continue; } -@@ -996,6 +1022,31 @@ +@@ -959,6 +985,31 @@ static const char *fbcon_startup(void) set_blitting_type(vc, info); @@ -97,7 +97,7 @@ /* Setup default font */ if (!p->fontdata && !vc->vc_font.data) { if (!fontname[0] || !(font = find_font(fontname))) -@@ -1169,6 +1220,9 @@ +@@ -1129,6 +1180,9 @@ static void fbcon_init(struct vc_data *v if (logo) fbcon_prepare_logo(vc, info, cols, rows, new_cols, new_rows); @@ -107,16 +107,26 @@ if (ops->rotate_font && ops->rotate_font(info, vc)) { ops->rotate = FB_ROTATE_UR; set_blitting_type(vc, info); -@@ -1331,6 +1385,7 @@ +@@ -1152,6 +1206,9 @@ static void fbcon_release_all(void) + struct fb_info *info; + int i, j, mapped; + ++ kvfree((void *)softback_buf); ++ softback_buf = 0UL; ++ + fbcon_for_each_registered_fb(i) { + mapped = 0; + info = fbcon_registered_fb[i]; +@@ -1312,6 +1369,7 @@ static void fbcon_cursor(struct vc_data { - struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]]; + struct fb_info *info = fbcon_info_from_console(vc->vc_num); struct fbcon_ops *ops = info->fbcon_par; + int y; int c = scr_readw((u16 *) vc->vc_pos); ops->cur_blink_jiffies = msecs_to_jiffies(vc->vc_cur_blink_ms); -@@ -1334,11 +1389,19 @@ static void fbcon_cursor(struct vc_data - fbcon_add_cursor_timer(info); +@@ -1325,11 +1383,19 @@ static void fbcon_cursor(struct vc_data + fbcon_add_cursor_work(info); ops->cursor_flash = (mode == CM_ERASE) ? 0 : 1; + if (mode & CM_SOFTBACK) { @@ -136,7 +146,7 @@ get_color(vc, info, c, 0)); } -@@ -1416,6 +1479,8 @@ +@@ -1399,6 +1465,8 @@ static void fbcon_set_disp(struct fb_inf if (con_is_visible(vc)) { update_screen(vc); @@ -145,7 +155,7 @@ } } -@@ -1553,6 +1618,99 @@ +@@ -1536,6 +1604,99 @@ static __inline__ void ypan_down_redraw( scrollback_current = 0; } @@ -245,8 +255,8 @@ static void fbcon_redraw_move(struct vc_data *vc, struct fbcon_display *p, int line, int count, int dy) { -@@ -1692,6 +1850,31 @@ - } +@@ -1740,6 +1901,31 @@ static void fbcon_bmove(struct vc_data * + p->vrows - p->yscroll); } +static inline void fbcon_softback_note(struct vc_data *vc, int t, @@ -277,17 +287,17 @@ static bool fbcon_scroll(struct vc_data *vc, unsigned int t, unsigned int b, enum con_scroll dir, unsigned int count) { -@@ -1714,6 +1897,8 @@ +@@ -1762,6 +1948,8 @@ static bool fbcon_scroll(struct vc_data case SM_UP: if (count > vc->vc_rows) /* Maximum realistic size */ count = vc->vc_rows; + if (softback_top) + fbcon_softback_note(vc, t, count); - if (logo_shown >= 0) - goto redraw_up; - switch (p->scrollmode) { -@@ -2084,6 +2269,14 @@ - info = registered_fb[con2fb_map[vc->vc_num]]; + switch (fb_scrollmode(p)) { + case SCROLL_MOVE: + fbcon_redraw_blit(vc, info, p, t, b - t - count, +@@ -2076,6 +2264,14 @@ static int fbcon_switch(struct vc_data * + info = fbcon_info_from_console(vc->vc_num); ops = info->fbcon_par; + if (softback_top) { @@ -301,8 +311,8 @@ if (logo_shown >= 0) { struct vc_data *conp2 = vc_cons[logo_shown].d; -@@ -2407,6 +2600,9 @@ - int cnt; +@@ -2406,6 +2602,9 @@ static int fbcon_do_set_font(struct vc_d + int resize; char *old_data = NULL; + if (con_is_visible(vc) && softback_lines) @@ -311,7 +321,7 @@ resize = (w != vc->vc_font.width) || (h != vc->vc_font.height); if (p->userfont) old_data = vc->vc_font.data; -@@ -2432,6 +2628,8 @@ +@@ -2428,6 +2627,8 @@ static int fbcon_do_set_font(struct vc_d cols /= w; rows /= h; vc_resize(vc, cols, rows); @@ -320,10 +330,11 @@ } else if (con_is_visible(vc) && vc->vc_mode == KD_TEXT) { fbcon_clear_margins(vc, 0); -@@ -2590,7 +2788,19 @@ +@@ -2582,7 +2783,19 @@ static void fbcon_set_palette(struct vc_ - static u16 *fbcon_screen_pos(struct vc_data *vc, int offset) + static u16 *fbcon_screen_pos(const struct vc_data *vc, int offset) { +- return (u16 *) (vc->vc_origin + offset); + unsigned long p; + int line; + @@ -337,17 +348,16 @@ + if (p >= softback_end) + p += softback_buf - softback_end; + return (u16 *) p; -- return (u16 *) (vc->vc_origin + offset); } static unsigned long fbcon_getxy(struct vc_data *vc, unsigned long pos, -@@ -2604,7 +2814,22 @@ +@@ -2596,7 +2809,22 @@ static unsigned long fbcon_getxy(struct x = offset % vc->vc_cols; y = offset / vc->vc_cols; + if (vc->vc_num == fg_console) + y += softback_lines; - ret = pos + (vc->vc_cols - x) * 2; ++ ret = pos + (vc->vc_cols - x) * 2; + } else if (vc->vc_num == fg_console && softback_lines) { + unsigned long offset = pos - softback_curr; + @@ -356,7 +366,7 @@ + offset /= 2; + x = offset % vc->vc_cols; + y = offset / vc->vc_cols; -+ ret = pos + (vc->vc_cols - x) * 2; + ret = pos + (vc->vc_cols - x) * 2; + if (ret == softback_end) + ret = softback_buf; + if (ret == softback_in) @@ -364,7 +374,7 @@ } else { /* Should not happen */ x = y = 0; -@@ -2632,11 +2857,106 @@ +@@ -2624,11 +2852,106 @@ static void fbcon_invert_region(struct v a = ((a) & 0x88ff) | (((a) & 0x7000) >> 4) | (((a) & 0x0700) << 4); scr_writew(a, p++); @@ -471,7 +481,7 @@ return 0; } -@@ -2700,6 +3020,8 @@ +@@ -2692,6 +3015,8 @@ static void fbcon_modechanged(struct fb_ fbcon_set_palette(vc, color_table); update_screen(vc); @@ -480,21 +490,11 @@ } } -@@ -3110,6 +3432,7 @@ +@@ -3154,6 +3479,7 @@ static const struct consw fb_con = { + .con_font_get = fbcon_get_font, .con_font_default = fbcon_set_def_font, - .con_font_copy = fbcon_copy_font, .con_set_palette = fbcon_set_palette, + .con_scrolldelta = fbcon_scrolldelta, .con_set_origin = fbcon_set_origin, .con_invert_region = fbcon_invert_region, .con_screen_pos = fbcon_screen_pos, -@@ -3344,6 +3667,9 @@ - } - #endif - -+ kvfree((void *)softback_buf); -+ softback_buf = 0UL; -+ - for_each_registered_fb(i) { - int pending = 0; - diff --git a/sys-kernel/pinephone-pro-sources/files/0301-bootsplash.patch b/sys-kernel/pinephone-pro-sources/files/0301-bootsplash.patch index d5835e5..04b3278 100644 --- a/sys-kernel/pinephone-pro-sources/files/0301-bootsplash.patch +++ b/sys-kernel/pinephone-pro-sources/files/0301-bootsplash.patch @@ -2,21 +2,21 @@ diff --git a/MAINTAINERS b/MAINTAINERS index a74227ad082e..b5633b56391e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2705,6 +2705,14 @@ S: Supported - F: drivers/net/bonding/ - F: include/uapi/linux/if_bonding.h +@@ -3615,6 +3615,14 @@ + F: Documentation/devicetree/bindings/iio/accel/bosch,bma400.yaml + F: drivers/iio/accel/bma400* +BOOTSPLASH -+M: Max Staudt -+L: linux-fbdev@vger.kernel.org -+S: Maintained -+F: drivers/video/fbdev/core/bootsplash*.* -+F: drivers/video/fbdev/core/dummycon.c -+F: include/linux/bootsplash.h ++M: Max Staudt ++L: linux-fbdev@vger.kernel.org ++S: Maintained ++F: drivers/video/fbdev/core/bootsplash*.* ++F: drivers/video/fbdev/core/dummycon.c ++F: include/linux/bootsplash.h + - BPF (Safe dynamic programs and tools) - M: Alexei Starovoitov - M: Daniel Borkmann + BPF [GENERAL] (Safe Dynamic Programs and Tools) + M: Alexei Starovoitov + M: Daniel Borkmann diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index 7f1f1fbcef9e..f3ff976266fe 100644 --- a/drivers/video/console/Kconfig diff --git a/sys-kernel/pinephone-pro-sources/files/0302-bootsplash.patch b/sys-kernel/pinephone-pro-sources/files/0302-bootsplash.patch index 92d62ca..5f7d07d 100644 --- a/sys-kernel/pinephone-pro-sources/files/0302-bootsplash.patch +++ b/sys-kernel/pinephone-pro-sources/files/0302-bootsplash.patch @@ -2,14 +2,14 @@ diff --git a/MAINTAINERS b/MAINTAINERS index b5633b56391e..5c237445761e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2712,6 +2712,7 @@ S: Maintained - F: drivers/video/fbdev/core/bootsplash*.* - F: drivers/video/fbdev/core/dummycon.c - F: include/linux/bootsplash.h -+F: include/uapi/linux/bootsplash_file.h +@@ -3622,6 +3622,7 @@ + F: drivers/video/fbdev/core/bootsplash*.* + F: drivers/video/fbdev/core/dummycon.c + F: include/linux/bootsplash.h ++F: include/uapi/linux/bootsplash_file.h - BPF (Safe dynamic programs and tools) - M: Alexei Starovoitov + BPF [GENERAL] (Safe Dynamic Programs and Tools) + M: Alexei Starovoitov diff --git a/drivers/video/fbdev/core/Makefile b/drivers/video/fbdev/core/Makefile index 66895321928e..6a8d1bab8a01 100644 --- a/drivers/video/fbdev/core/Makefile diff --git a/sys-kernel/pinephone-pro-sources/files/0310-bootsplash.patch b/sys-kernel/pinephone-pro-sources/files/0310-bootsplash.patch index e5c1fd0..a55d4b6 100644 --- a/sys-kernel/pinephone-pro-sources/files/0310-bootsplash.patch +++ b/sys-kernel/pinephone-pro-sources/files/0310-bootsplash.patch @@ -310,12 +310,12 @@ diff --git a/MAINTAINERS b/MAINTAINERS index 5c237445761e..7ffac272434e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2709,6 +2709,8 @@ BOOTSPLASH - M: Max Staudt - L: linux-fbdev@vger.kernel.org - S: Maintained -+F: Documentation/ABI/testing/sysfs-platform-bootsplash -+F: Documentation/bootsplash.rst - F: drivers/video/fbdev/core/bootsplash*.* - F: drivers/video/fbdev/core/dummycon.c - F: include/linux/bootsplash.h +@@ -3619,6 +3619,8 @@ + M: Max Staudt + L: linux-fbdev@vger.kernel.org + S: Maintained ++F: Documentation/ABI/testing/sysfs-platform-bootsplash ++F: Documentation/bootsplash.rst + F: drivers/video/fbdev/core/bootsplash*.* + F: drivers/video/fbdev/core/dummycon.c + F: include/linux/bootsplash.h diff --git a/sys-kernel/pinephone-pro-sources/files/0312-bootsplash.patch b/sys-kernel/pinephone-pro-sources/files/0312-bootsplash.patch index 5d8ea1f..c6597a1 100644 --- a/sys-kernel/pinephone-pro-sources/files/0312-bootsplash.patch +++ b/sys-kernel/pinephone-pro-sources/files/0312-bootsplash.patch @@ -2,14 +2,14 @@ diff --git a/MAINTAINERS b/MAINTAINERS index 7ffac272434e..ddff07cd794c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2715,6 +2715,7 @@ F: drivers/video/fbdev/core/bootsplash*.* - F: drivers/video/fbdev/core/dummycon.c - F: include/linux/bootsplash.h - F: include/uapi/linux/bootsplash_file.h -+F: tools/bootsplash/* +@@ -3625,6 +3625,7 @@ + F: drivers/video/fbdev/core/dummycon.c + F: include/linux/bootsplash.h + F: include/uapi/linux/bootsplash_file.h ++F: tools/bootsplash/* - BPF (Safe dynamic programs and tools) - M: Alexei Starovoitov + BPF [GENERAL] (Safe Dynamic Programs and Tools) + M: Alexei Starovoitov diff --git a/tools/bootsplash/.gitignore b/tools/bootsplash/.gitignore new file mode 100644 index 000000000000..091b99a17567 diff --git a/sys-kernel/pinephone-pro-sources/pinephone-pro-sources-5.19.0.ebuild b/sys-kernel/pinephone-pro-sources/pinephone-pro-sources-5.19.2.ebuild similarity index 98% rename from sys-kernel/pinephone-pro-sources/pinephone-pro-sources-5.19.0.ebuild rename to sys-kernel/pinephone-pro-sources/pinephone-pro-sources-5.19.2.ebuild index 199770b..202439f 100644 --- a/sys-kernel/pinephone-pro-sources/pinephone-pro-sources-5.19.0.ebuild +++ b/sys-kernel/pinephone-pro-sources/pinephone-pro-sources-5.19.2.ebuild @@ -17,7 +17,7 @@ DEPEND="${RDEPEND} DESCRIPTION="Full sources for the Linux kernel, with megi's patch for pinephone and gentoo patchset" -MEGI_TAG="orange-pi-5.19-20220802-0940" +MEGI_TAG="orange-pi-5.19-20220818-0237" SRC_URI="https://github.com/megous/linux/archive/${MEGI_TAG}.tar.gz" PATCHES=(