From: Greg Kroah-Hartman Date: Sun, 16 Oct 2022 09:31:44 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v5.4.219~163 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e98a1a93f99f6e6a9fccc281a56975c71f93945;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: parisc-fbdev-stifb-align-graphics-memory-size-to-4mb.patch --- diff --git a/queue-4.9/parisc-fbdev-stifb-align-graphics-memory-size-to-4mb.patch b/queue-4.9/parisc-fbdev-stifb-align-graphics-memory-size-to-4mb.patch new file mode 100644 index 00000000000..a0e99b982e2 --- /dev/null +++ b/queue-4.9/parisc-fbdev-stifb-align-graphics-memory-size-to-4mb.patch @@ -0,0 +1,31 @@ +From aca7c13d3bee81a968337a5515411409ae9d095d Mon Sep 17 00:00:00 2001 +From: Helge Deller +Date: Fri, 14 Oct 2022 10:13:55 +0200 +Subject: parisc: fbdev/stifb: Align graphics memory size to 4MB + +From: Helge Deller + +commit aca7c13d3bee81a968337a5515411409ae9d095d upstream. + +Independend of the current graphics resolution, adjust the reported +graphics card memory size to the next 4MB boundary. +This fixes the fbtest program which expects a naturally aligned size. + +Signed-off-by: Helge Deller +Cc: +Signed-off-by: Greg Kroah-Hartman +--- + drivers/video/fbdev/stifb.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/video/fbdev/stifb.c ++++ b/drivers/video/fbdev/stifb.c +@@ -1259,7 +1259,7 @@ static int __init stifb_init_fb(struct s + + /* limit fbsize to max visible screen size */ + if (fix->smem_len > yres*fix->line_length) +- fix->smem_len = yres*fix->line_length; ++ fix->smem_len = ALIGN(yres*fix->line_length, 4*1024*1024); + + fix->accel = FB_ACCEL_NONE; + diff --git a/queue-4.9/series b/queue-4.9/series index c125f22bdb2..fe917378a73 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -47,3 +47,4 @@ fs-dlm-fix-race-between-test_bit-and-queue_work.patch fs-dlm-handle-ebusy-first-in-lock-arg-validation.patch quota-check-next-prev-free-block-number-after-reading-from-quota-file.patch regulator-qcom_rpm-fix-circular-deferral-regression.patch +parisc-fbdev-stifb-align-graphics-memory-size-to-4mb.patch