From: Antonino A. Daplas Date: Tue, 8 May 2007 07:39:12 +0000 (-0700) Subject: vga16fb: restrict to blit rectangles with widths of multiples of 8 pixels X-Git-Tag: v2.6.22-rc1~398 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d60d2d8a423be91c5ad1a745c4e9dda9cea1b3c5;p=linux-2.6 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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 75ec7d155d..51c4b25dad 100644 --- 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 ec4c7dc54a..6c580a02b8 100644 --- 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;