korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-26 05:34:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

s3fb: updates

Browse Source 
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>
This commit is contained in:
Ondrej Zajicek 2007-05-08 00:40:00 -07:00 committed by Linus Torvalds
parent 9a31f0f767
commit 34ed25f50b
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/video/s3fb.c
View File

@ -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 = { static struct fb_tile_ops s3fb_tile_ops = {
.fb_settile = svga_settile, .fb_settile = svga_settile,
.fb_tilecopy = svga_tilecopy, .fb_tilecopy = svga_tilecopy,
.fb_tilefill = svga_tilefill, .fb_tilefill = svga_tilefill,
.fb_tileblit = svga_tileblit, .fb_tileblit = svga_tileblit,
.fb_tilecursor = svga_tilecursor, .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 = { 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_tilefill = svga_tilefill,
.fb_tileblit = svga_tileblit, .fb_tileblit = svga_tileblit,
.fb_tilecursor = svga_tilecursor, .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->flags &= ~FBINFO_MISC_TILEBLITTING;
info->tileops = NULL; info->tileops = NULL;
/* supports blit rectangles of any dimension */ /* in 4bpp supports 8p wide tiles only, any tiles otherwise */
info->pixmap.blit_x = ~(u32)0; info->pixmap.blit_x = (bpp == 4) ? (1 << (8 - 1)) : (~(u32)0);
info->pixmap.blit_y = ~(u32)0; info->pixmap.blit_y = ~(u32)0;
offset_value = (info->var.xres_virtual * bpp) / 64; offset_value = (info->var.xres_virtual * bpp) / 64;
screen_size = info->var.yres_virtual * info->fix.line_length; screen_size = info->var.yres_virtual * info->fix.line_length;
} else { } else {
@ -470,6 +466,7 @@ static int s3fb_set_par(struct fb_info *info)
info->flags |= FBINFO_MISC_TILEBLITTING; info->flags |= FBINFO_MISC_TILEBLITTING;
info->tileops = fasttext ? &s3fb_fast_tile_ops : &s3fb_tile_ops; info->tileops = fasttext ? &s3fb_fast_tile_ops : &s3fb_tile_ops;
/* supports 8x16 tiles only */ /* supports 8x16 tiles only */
info->pixmap.blit_x = 1 << (8 - 1); info->pixmap.blit_x = 1 << (8 - 1);
info->pixmap.blit_y = 1 << (16 - 1); info->pixmap.blit_y = 1 << (16 - 1);

6
drivers/video/svgalib.c
View File

@ -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 */ 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_tilefill);
EXPORT_SYMBOL(svga_tileblit); EXPORT_SYMBOL(svga_tileblit);
EXPORT_SYMBOL(svga_tilecursor); EXPORT_SYMBOL(svga_tilecursor);
EXPORT_SYMBOL(svga_get_tilemax);
EXPORT_SYMBOL(svga_compute_pll); EXPORT_SYMBOL(svga_compute_pll);
EXPORT_SYMBOL(svga_check_timings); EXPORT_SYMBOL(svga_check_timings);

1
include/linux/svga.h
View File

@ -112,6 +112,7 @@ void svga_tilecopy(struct fb_info *info, struct fb_tilearea *area);
void svga_tilefill(struct fb_info *info, struct fb_tilerect *rect); void svga_tilefill(struct fb_info *info, struct fb_tilerect *rect);
void svga_tileblit(struct fb_info *info, struct fb_tileblit *blit); void svga_tileblit(struct fb_info *info, struct fb_tileblit *blit);
void svga_tilecursor(struct fb_info *info, struct fb_tilecursor *cursor); void svga_tilecursor(struct fb_info *info, struct fb_tilecursor *cursor);
int svga_get_tilemax(struct fb_info *info);
int svga_compute_pll(const struct svga_pll *pll, u32 f_wanted, u16 *m, u16 *n, u16 *r, int node); int svga_compute_pll(const struct svga_pll *pll, u32 f_wanted, u16 *m, u16 *n, u16 *r, int node);
int svga_check_timings(const struct svga_timing_regs *tm, struct fb_var_screeninfo *var, int node); int svga_check_timings(const struct svga_timing_regs *tm, struct fb_var_screeninfo *var, int node);