summaryrefslogtreecommitdiffstats
path: root/drivers/video/fbdev/vga16fb.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-05 19:21:13 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-05 19:21:13 +0000
commite67e4ad4b161bd60b9da4c1872a9d77e0cac95fa (patch)
tree5c58f869f31ddb1f7bd6e8bdea269b680b36c5b6 /drivers/video/fbdev/vga16fb.c
parentReleasing progress-linux version 6.8.12-1~progress7.99u1. (diff)
downloadlinux-e67e4ad4b161bd60b9da4c1872a9d77e0cac95fa.tar.xz
linux-e67e4ad4b161bd60b9da4c1872a9d77e0cac95fa.zip
Merging upstream version 6.9.7.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'drivers/video/fbdev/vga16fb.c')
-rw-r--r--drivers/video/fbdev/vga16fb.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/fbdev/vga16fb.c b/drivers/video/fbdev/vga16fb.c
index b485e91982..a87bafbb11 100644
--- a/drivers/video/fbdev/vga16fb.c
+++ b/drivers/video/fbdev/vga16fb.c
@@ -1353,7 +1353,11 @@ static int vga16fb_probe(struct platform_device *dev)
info->var = vga16fb_defined;
info->fix = vga16fb_fix;
/* supports rectangles with widths of multiples of 8 */
- info->pixmap.blit_x = 1 << 7 | 1 << 15 | 1 << 23 | 1 << 31;
+ bitmap_zero(info->pixmap.blit_x, FB_MAX_BLIT_WIDTH);
+ set_bit(8 - 1, info->pixmap.blit_x);
+ set_bit(16 - 1, info->pixmap.blit_x);
+ set_bit(24 - 1, info->pixmap.blit_x);
+ set_bit(32 - 1, info->pixmap.blit_x);
info->flags = FBINFO_HWACCEL_YPAN;
i = (info->var.bits_per_pixel == 8) ? 256 : 16;