summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2007-05-08 00:39:12 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 11:15:31 -0700
commitd60d2d8a423be91c5ad1a745c4e9dda9cea1b3c5 (patch)
treec3c550698372e12892a5ecb7c773cedff770560c
parent2d2699d984924890f6dac8cf51c3b6311f56816c (diff)
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>
-rw-r--r--drivers/video/Kconfig1
-rw-r--r--drivers/video/vga16fb.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 75ec7d155da..51c4b25dad2 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 ec4c7dc54a6..6c580a02b82 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;