aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2007-05-08 03:39:12 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:15:31 -0400
commitd60d2d8a423be91c5ad1a745c4e9dda9cea1b3c5 (patch)
treec3c550698372e12892a5ecb7c773cedff770560c /drivers
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>
Diffstat (limited to 'drivers')
-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 75ec7d155da9..51c4b25dad25 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -519,6 +519,7 @@ config FB_VGA16
519 select FB_CFB_COPYAREA 519 select FB_CFB_COPYAREA
520 select FB_CFB_IMAGEBLIT 520 select FB_CFB_IMAGEBLIT
521 select VGASTATE 521 select VGASTATE
522 select FONT_8x16 if FRAMEBUFFER_CONSOLE
522 help 523 help
523 This is the frame buffer device driver for VGA 16 color graphic 524 This is the frame buffer device driver for VGA 16 color graphic
524 cards. Say Y if you have such a card. 525 cards. Say Y if you have such a card.
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index ec4c7dc54a66..6c580a02b829 100644
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -1378,6 +1378,8 @@ static int __init vga16fb_probe(struct platform_device *dev)
1378 info->fbops = &vga16fb_ops; 1378 info->fbops = &vga16fb_ops;
1379 info->var = vga16fb_defined; 1379 info->var = vga16fb_defined;
1380 info->fix = vga16fb_fix; 1380 info->fix = vga16fb_fix;
1381 /* supports 8-pixel wide blit rectangles only */
1382 info->pixmap.blit_x = 1 << (8 - 1);
1381 info->flags = FBINFO_FLAG_DEFAULT | 1383 info->flags = FBINFO_FLAG_DEFAULT |
1382 FBINFO_HWACCEL_YPAN; 1384 FBINFO_HWACCEL_YPAN;
1383 1385