vga16fb: restrict to blit rectangles with widths of multiples of 8 pixels

Advertise that vga16fb can only handle widths that are 8-pixel-multiple only
(software limitation). To ensure that a legal font is available, SELECT an
8x16 font in Kconfig.

Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 75ec7d155da912b516873e7731632d7b78e88fa4..51c4b25dad25ca39973554ce3ce957e2be333f83 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -519,6 +519,7 @@ config FB_VGA16
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
        select VGASTATE
+       select FONT_8x16 if FRAMEBUFFER_CONSOLE
        help
          This is the frame buffer device driver for VGA 16 color graphic
          cards. Say Y if you have such a card.

diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index ec4c7dc54a66972dbc662e0137b468d2bda088aa..6c580a02b82917d84ba4361cbb6df1a03451d9b0 100644 (file)
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -1378,6 +1378,8 @@ static int __init vga16fb_probe(struct platform_device *dev)
        info->fbops = &vga16fb_ops;
        info->var = vga16fb_defined;
        info->fix = vga16fb_fix;
+       /* supports 8-pixel wide blit rectangles only */
+       info->pixmap.blit_x = 1 << (8 - 1);
        info->flags = FBINFO_FLAG_DEFAULT |
                FBINFO_HWACCEL_YPAN;