From: Helge Deller Date: Fri, 14 Oct 2022 08:13:55 +0000 (+0200) Subject: parisc: fbdev/stifb: Align graphics memory size to 4MB X-Git-Tag: v4.9.331~110 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=263db3d8c886d62c30385591d4c59d8fd9ee79ba;p=thirdparty%2Fkernel%2Fstable.git parisc: fbdev/stifb: Align graphics memory size to 4MB 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 --- diff --git a/drivers/video/fbdev/stifb.c b/drivers/video/fbdev/stifb.c index 7df4228e25f05..ab828645b091b 100644 --- a/drivers/video/fbdev/stifb.c +++ b/drivers/video/fbdev/stifb.c @@ -1259,7 +1259,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref) /* 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;