diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-05-25 11:34:52 +0200 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-08-19 10:32:52 +0200 |
| commit | 9f1b3ebbce04dc61986a1b3b41b0f1b1a77a5cc4 (patch) | |
| tree | 86085e8614b383f2c3a41865f0a9bd9ebb7b7020 /drivers/video/mx3fb.c | |
| parent | 23dc8b1c07f75427510d56fa7c263dd1371ec2e4 (diff) | |
| download | op-kernel-dev-9f1b3ebbce04dc61986a1b3b41b0f1b1a77a5cc4.zip op-kernel-dev-9f1b3ebbce04dc61986a1b3b41b0f1b1a77a5cc4.tar.gz | |
mx3fb: use display information in info not in var for panning
We must not use any information in the passed var besides xoffset,
yoffset and vmode as otherwise applications might abuse it. Also use the
aligned fix.line_length and not the (possible) unaligned xres_virtual.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Diffstat (limited to 'drivers/video/mx3fb.c')
| -rw-r--r-- | drivers/video/mx3fb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c index 7e3a490..bd76858 100644 --- a/drivers/video/mx3fb.c +++ b/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", |
