Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8db51668f5ef6ae31ed4e4f0c6e2976a190dfa11
Commit:     8db51668f5ef6ae31ed4e4f0c6e2976a190dfa11
Parent:     d60d2d8a423be91c5ad1a745c4e9dda9cea1b3c5
Author:     Antonino A. Daplas <[EMAIL PROTECTED]>
AuthorDate: Tue May 8 00:39:14 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue May 8 11:15:31 2007 -0700

    s3fb: limit 8x16 rectangles when tileblitting is enabled
    
    If tileblitting is enabled (text mode), the hardware can only accept 8x16
    bitmaps. Advertise this to the upper layer. And to ensure that an 
appropriate
    font is always available, select an 8x16 font in Kconfig.
    
    Signed-off-by: Antonino Daplas <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/video/Kconfig |    1 +
 drivers/video/s3fb.c  |    6 ++++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 51c4b25..863c598 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1194,6 +1194,7 @@ config FB_S3
        select FB_TILEBLITTING
        select FB_SVGALIB
        select VGASTATE
+       select FONT_8x16 if FRAMEBUFFER_CONSOLE
        ---help---
          Driver for graphics boards with S3 Trio / S3 Virge chip.
 
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index f3470bb..53f1eb9 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -449,6 +449,9 @@ static int s3fb_set_par(struct fb_info *info)
                info->flags &= ~FBINFO_MISC_TILEBLITTING;
                info->tileops = NULL;
 
+               /* supports blit rectangles of any dimension */
+               info->pixmap.blit_x = ~(u32)0;
+               info->pixmap.blit_y = ~(u32)0;
                offset_value = (info->var.xres_virtual * bpp) / 64;
                screen_size = info->var.yres_virtual * info->fix.line_length;
        } else {
@@ -457,6 +460,9 @@ static int s3fb_set_par(struct fb_info *info)
 
                info->flags |= FBINFO_MISC_TILEBLITTING;
                info->tileops = fasttext ? &s3fb_fast_tile_ops : &s3fb_tile_ops;
+               /* supports 8x16 tiles only */
+               info->pixmap.blit_x = 1 << (8 - 1);
+               info->pixmap.blit_y = 1 << (16 - 1);
 
                offset_value = info->var.xres_virtual / 16;
                screen_size = (info->var.xres_virtual * info->var.yres_virtual) 
/ 64;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to