s3fb: updates

Move s3fb_get_tilemax to svgalib.c as svga_get_tilemax, because it reports
limitation of other code from svgalib (svga_settile, svga_tilecopy, ...)

Limit font width to 8 pixels in 4 bpp mode.

Signed-off-by: Ondrej Zajicek <santiago@crfreenet.org>
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>

2 files changed, 12 insertions, 9 deletions

diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 4d0e204dd8ad..756fafb41d78 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -183,18 +183,13 @@ static void s3fb_settile_fast(struct fb_info *info, struct fb_tilemap *map)
         }
 }
 
-static int s3fb_get_tilemax(struct fb_info *info)
-{
-        return 256;
-}
-
 static struct fb_tile_ops s3fb_tile_ops = {
         .fb_settile     = svga_settile,
         .fb_tilecopy    = svga_tilecopy,
         .fb_tilefill    = svga_tilefill,
         .fb_tileblit    = svga_tileblit,
         .fb_tilecursor  = svga_tilecursor,
-        .fb_get_tilemax = s3fb_get_tilemax,
+        .fb_get_tilemax = svga_get_tilemax,
 };
 
 static struct fb_tile_ops s3fb_fast_tile_ops = {
@@ -203,7 +198,7 @@ static struct fb_tile_ops s3fb_fast_tile_ops = {
         .fb_tilefill    = svga_tilefill,
         .fb_tileblit    = svga_tileblit,
         .fb_tilecursor  = svga_tilecursor,
-        .fb_get_tilemax = s3fb_get_tilemax,
+        .fb_get_tilemax = svga_get_tilemax,
 };
 
 
@@ -459,9 +454,10 @@ 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;
+                /* in 4bpp supports 8p wide tiles only, any tiles otherwise */
+                info->pixmap.blit_x = (bpp == 4) ? (1 << (8 - 1)) : (~(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 {
@@ -470,6 +466,7 @@ 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);
diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c
index 7fddc4a9b99b..079cdc911e48 100644
--- a/drivers/video/svgalib.c
+++ b/drivers/video/svgalib.c
@@ -342,6 +342,11 @@ void svga_tilecursor(struct fb_info *info, struct fb_tilecursor *cursor)
         vga_wcrt(NULL, 0x0A, cs); /* set cursor start and enable it */
 }
 
+int svga_get_tilemax(struct fb_info *info)
+{
+        return 256;
+}
+
 
 /* ------------------------------------------------------------------------- */
 
@@ -623,6 +628,7 @@ EXPORT_SYMBOL(svga_tilecopy);
 EXPORT_SYMBOL(svga_tilefill);
 EXPORT_SYMBOL(svga_tileblit);
 EXPORT_SYMBOL(svga_tilecursor);
+EXPORT_SYMBOL(svga_get_tilemax);
 
 EXPORT_SYMBOL(svga_compute_pll);
 EXPORT_SYMBOL(svga_check_timings);