From 6a6c7cd93d7e5227ac4529987bbf7f6a14e13ebd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 16 Oct 2022 11:31:54 +0200 Subject: [PATCH] 4.14-stable patches added patches: parisc-fbdev-stifb-align-graphics-memory-size-to-4mb.patch --- ...fb-align-graphics-memory-size-to-4mb.patch | 31 +++++++++++++++++++ ...fmode_lseek-to-control-internal-pipe.patch | 9 ++---- queue-4.14/series | 1 + 3 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 queue-4.14/parisc-fbdev-stifb-align-graphics-memory-size-to-4mb.patch diff --git a/queue-4.14/parisc-fbdev-stifb-align-graphics-memory-size-to-4mb.patch b/queue-4.14/parisc-fbdev-stifb-align-graphics-memory-size-to-4mb.patch new file mode 100644 index 00000000000..a0e99b982e2 --- /dev/null +++ b/queue-4.14/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.14/revert-fs-check-fmode_lseek-to-control-internal-pipe.patch b/queue-4.14/revert-fs-check-fmode_lseek-to-control-internal-pipe.patch index ee39fce5ddb..bd407e7b2b8 100644 --- a/queue-4.14/revert-fs-check-fmode_lseek-to-control-internal-pipe.patch +++ b/queue-4.14/revert-fs-check-fmode_lseek-to-control-internal-pipe.patch @@ -13,14 +13,12 @@ now. Reported-by: Saeed Mirzamohammadi Signed-off-by: Sasha Levin --- - fs/splice.c | 10 ++++++---- + fs/splice.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -diff --git a/fs/splice.c b/fs/splice.c -index 04d25af25a42..c84ac7e97e21 100644 --- a/fs/splice.c +++ b/fs/splice.c -@@ -898,15 +898,17 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd, +@@ -898,15 +898,17 @@ ssize_t splice_direct_to_actor(struct fi { struct pipe_inode_info *pipe; long ret, bytes; @@ -42,6 +40,3 @@ index 04d25af25a42..c84ac7e97e21 100644 return -EINVAL; /* --- -2.35.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 6725b5171d9..acdc798d4c6 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -58,3 +58,4 @@ hid-multitouch-add-memory-barriers.patch quota-check-next-prev-free-block-number-after-reading-from-quota-file.patch regulator-qcom_rpm-fix-circular-deferral-regression.patch revert-fs-check-fmode_lseek-to-control-internal-pipe.patch +parisc-fbdev-stifb-align-graphics-memory-size-to-4mb.patch -- 2.47.3