From ab2f59acf093e9603ca4ea53b3b0e1f29e5bc1e0 Mon Sep 17 00:00:00 2001 From: Samuel CUELLA Date: Tue, 10 Mar 2009 12:56:00 -0700 Subject: [PATCH] --- yaml --- r: 132183 b: refs/heads/master c: 16b71fdf97599f1b1b7f38418ee9922d9f117396 h: refs/heads/master i: 132181: bb2f21e0a22d8f96e89cfd833d637a4c6e0352bd 132179: cb5bef89d1861f456f7e0fec4efcfd6389546023 132175: 8c148baf9490fb4da1c9fbd0c181c924b7662447 v: v3 --- [refs] | 2 +- trunk/drivers/video/i810/i810_main.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4877e8670226..bed389f86a12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9233ecc5c4b5f31921d914b3ef3baa3dc1ae4cc6 +refs/heads/master: 16b71fdf97599f1b1b7f38418ee9922d9f117396 diff --git a/trunk/drivers/video/i810/i810_main.c b/trunk/drivers/video/i810/i810_main.c index a24e680d2b9c..2e940199fc89 100644 --- a/trunk/drivers/video/i810/i810_main.c +++ b/trunk/drivers/video/i810/i810_main.c @@ -993,6 +993,7 @@ static int i810_check_params(struct fb_var_screeninfo *var, struct i810fb_par *par = info->par; int line_length, vidmem, mode_valid = 0, retval = 0; u32 vyres = var->yres_virtual, vxres = var->xres_virtual; + /* * Memory limit */ @@ -1002,12 +1003,12 @@ static int i810_check_params(struct fb_var_screeninfo *var, if (vidmem > par->fb.size) { vyres = par->fb.size/line_length; if (vyres < var->yres) { - vyres = yres; + vyres = info->var.yres; vxres = par->fb.size/vyres; vxres /= var->bits_per_pixel >> 3; line_length = get_line_length(par, vxres, var->bits_per_pixel); - vidmem = line_length * yres; + vidmem = line_length * info->var.yres; if (vxres < var->xres) { printk("i810fb: required video memory, " "%d bytes, for %dx%d-%d (virtual) "