From 5bb25bbf4e95c31c8dd36c2ed58a7e5bca4e4e58 Mon Sep 17 00:00:00 2001 From: Florian Tobias Schandinat Date: Mon, 6 Jun 2011 01:27:34 +0000 Subject: [PATCH] --- yaml --- r: 271275 b: refs/heads/master c: 936a3f770b8de7042d793272f008ef1bb08522e9 h: refs/heads/master i: 271273: 6c385244932cc6a5184f9a45b16a5d7ae6d01194 271271: f85e038fdc0e7f1b7c7ca0d0104814c8093e9c8c v: v3 --- [refs] | 2 +- trunk/drivers/video/via/via_modesetting.h | 5 +++++ trunk/drivers/video/via/viafbdev.c | 11 ++++++++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 91a2798c6038..8e5632c35474 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d933990c57b498c092ceef591c7c5d69dbfe9f30 +refs/heads/master: 936a3f770b8de7042d793272f008ef1bb08522e9 diff --git a/trunk/drivers/video/via/via_modesetting.h b/trunk/drivers/video/via/via_modesetting.h index ae35cfdeb37c..013884543e91 100644 --- a/trunk/drivers/video/via/via_modesetting.h +++ b/trunk/drivers/video/via/via_modesetting.h @@ -28,6 +28,11 @@ #include + +#define VIA_PITCH_SIZE (1<<3) +#define VIA_PITCH_MAX 0x3FF8 + + void via_set_primary_address(u32 addr); void via_set_secondary_address(u32 addr); void via_set_primary_pitch(u32 pitch); diff --git a/trunk/drivers/video/via/viafbdev.c b/trunk/drivers/video/via/viafbdev.c index aa87529d7d6a..bddae58ecd8a 100644 --- a/trunk/drivers/video/via/viafbdev.c +++ b/trunk/drivers/video/via/viafbdev.c @@ -151,7 +151,8 @@ 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 * bpp / 8 + 7) & ~7; + info->fix.line_length = ALIGN(info->var.xres_virtual * bpp / 8, + VIA_PITCH_SIZE); } static void viafb_setup_fixinfo(struct fb_fix_screeninfo *fix, @@ -238,8 +239,12 @@ static int viafb_check_var(struct fb_var_screeninfo *var, depth = 24; viafb_fill_var_color_info(var, depth); - line = (var->xres_virtual * var->bits_per_pixel / 8 + 7) & ~7; - if (line * var->yres_virtual > ppar->memsize) + if (var->xres_virtual < var->xres) + var->xres_virtual = var->xres; + + line = ALIGN(var->xres_virtual * var->bits_per_pixel / 8, + VIA_PITCH_SIZE); + if (line > VIA_PITCH_MAX || line * var->yres_virtual > ppar->memsize) return -EINVAL; /* Based on var passed in to calculate the refresh,