From 977afdd070c6c1355b4337f7d4e1ae86a75a992e Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 25 May 2011 11:34:52 +0200 Subject: [PATCH] --- yaml --- r: 271203 b: refs/heads/master c: 9f1b3ebbce04dc61986a1b3b41b0f1b1a77a5cc4 h: refs/heads/master i: 271201: 07bed4a4820b7be8d30ad828ad537b0424084692 271199: 6949bb77020f63017f5ec331606b226626ae4a2f v: v3 --- [refs] | 2 +- trunk/drivers/video/mx3fb.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 36a2a2a65a82..2d0b3c84b200 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23dc8b1c07f75427510d56fa7c263dd1371ec2e4 +refs/heads/master: 9f1b3ebbce04dc61986a1b3b41b0f1b1a77a5cc4 diff --git a/trunk/drivers/video/mx3fb.c b/trunk/drivers/video/mx3fb.c index 7e3a490e8d76..bd768588cf10 100644 --- a/trunk/drivers/video/mx3fb.c +++ b/trunk/drivers/video/mx3fb.c @@ -1062,15 +1062,15 @@ static int mx3fb_pan_display(struct fb_var_screeninfo *var, y_bottom = var->yoffset; if (!(var->vmode & FB_VMODE_YWRAP)) - y_bottom += var->yres; + y_bottom += fbi->var.yres; if (y_bottom > fbi->var.yres_virtual) return -EINVAL; mutex_lock(&mx3_fbi->mutex); - offset = (var->yoffset * var->xres_virtual + var->xoffset) * - (var->bits_per_pixel / 8); + offset = var->yoffset * fbi->fix.line_length + + var->xoffset * (fbi->var.bits_per_pixel / 8); base = fbi->fix.smem_start + offset; dev_dbg(fbi->device, "Updating SDC BG buf %d address=0x%08lX\n",