Merge tag 'fbdev-for-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[linux-2.6-microblaze.git] / drivers / video / fbdev / vt8623fb.c

diff --git a/drivers/video/fbdev/vt8623fb.c b/drivers/video/fbdev/vt8623fb.c
index f8d022c..df984f3 100644 (file)
--- a/drivers/video/fbdev/vt8623fb.c
+++ b/drivers/video/fbdev/vt8623fb.c
@@ -390,8 +390,13 @@ static int vt8623fb_set_par(struct fb_info *info)
                info->tileops = NULL;
 
                /* in 4bpp supports 8p wide tiles only, any tiles otherwise */
-               info->pixmap.blit_x = (bpp == 4) ? (1 << (8 - 1)) : (~(u32)0);
-               info->pixmap.blit_y = ~(u32)0;
+               if (bpp == 4) {
+                       bitmap_zero(info->pixmap.blit_x, FB_MAX_BLIT_WIDTH);
+                       set_bit(8 - 1, info->pixmap.blit_x);
+               } else {
+                       bitmap_fill(info->pixmap.blit_x, FB_MAX_BLIT_WIDTH);
+               }
+               bitmap_fill(info->pixmap.blit_y, FB_MAX_BLIT_HEIGHT);
 
                offset_value = (info->var.xres_virtual * bpp) / 64;
                fetch_value  = ((info->var.xres * bpp) / 128) + 4;
@@ -408,8 +413,10 @@ static int vt8623fb_set_par(struct fb_info *info)
                info->tileops = &vt8623fb_tile_ops;
 
                /* supports 8x16 tiles only */
-               info->pixmap.blit_x = 1 << (8 - 1);
-               info->pixmap.blit_y = 1 << (16 - 1);
+               bitmap_zero(info->pixmap.blit_x, FB_MAX_BLIT_WIDTH);
+               set_bit(8 - 1, info->pixmap.blit_x);
+               bitmap_zero(info->pixmap.blit_y, FB_MAX_BLIT_HEIGHT);
+               set_bit(16 - 1, info->pixmap.blit_y);
 
                offset_value = info->var.xres_virtual / 16;
                fetch_value  = (info->var.xres / 8) + 8;