diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2010-03-10 15:21:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 15:52:34 -0800 |
| commit | dbb7884be758ca9ac5ec84cbe7eb21f21bce9d8f (patch) | |
| tree | 4e6bbb4859ff6831310eef83ab8458040c015df3 /drivers | |
| parent | bd140691bda491b417a6d1e81b03416b54cb8d8d (diff) | |
| download | linux-dbb7884be758ca9ac5ec84cbe7eb21f21bce9d8f.tar.gz linux-dbb7884be758ca9ac5ec84cbe7eb21f21bce9d8f.tar.bz2 linux-dbb7884be758ca9ac5ec84cbe7eb21f21bce9d8f.zip | |
viafb: some virtual_xres handling fixes
Do not require the virtual_xres to be aligned as line length is for such
purposes. Calculate always the smallest line length required.
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Joseph Chan <JosephChan@via.com.tw>
Cc: Scott Fang <ScottFang@viatech.com.cn>
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/via/viafbdev.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c index bd8db75236ab..0fe748d66a6c 100644 --- a/drivers/video/via/viafbdev.c +++ b/drivers/video/via/viafbdev.c @@ -107,8 +107,7 @@ static void viafb_update_fix(struct fb_info *info) info->fix.visual = bpp == 8 ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR; - info->fix.line_length = - ((info->var.xres_virtual + 7) & ~7) * bpp / 8; + info->fix.line_length = (info->var.xres_virtual * bpp / 8 + 7) & ~7; } static void viafb_setup_fixinfo(struct fb_fix_screeninfo *fix, @@ -148,7 +147,7 @@ static int viafb_check_var(struct fb_var_screeninfo *var, int htotal, vtotal, depth; struct VideoModeTable *vmode_entry; struct viafb_par *ppar = info->par; - u32 long_refresh; + u32 long_refresh, line; DEBUG_MSG(KERN_INFO "viafb_check_var!\n"); /* Sanity check */ @@ -180,11 +179,8 @@ static int viafb_check_var(struct fb_var_screeninfo *var, depth = 24; viafb_fill_var_color_info(var, depth); - if ((var->xres_virtual * (var->bits_per_pixel >> 3)) & 0x1F) - /*32 pixel alignment */ - var->xres_virtual = (var->xres_virtual + 31) & ~31; - if (var->xres_virtual * var->yres_virtual * var->bits_per_pixel / 8 > - ppar->memsize) + line = (var->xres_virtual * var->bits_per_pixel / 8 + 7) & ~7; + if (line * var->yres_virtual > ppar->memsize) return -EINVAL; /* Based on var passed in to calculate the refresh, |