From: Laurent Pinchart Date: Wed, 25 May 2011 09:34:52 +0000 (+0200) Subject: arkfb: use display information in info not in var for panning X-Git-Tag: v3.3-rc3~7^2~134^2~25 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a35a9b79dd44b36b688c493610dfbbdb42aff136;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git arkfb: 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. Signed-off-by: Laurent Pinchart --- diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c index 8686429..555dd4c 100644 --- a/drivers/video/arkfb.c +++ b/drivers/video/arkfb.c @@ -908,13 +908,14 @@ static int arkfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info unsigned int offset; /* Calculate the offset */ - if (var->bits_per_pixel == 0) { - offset = (var->yoffset / 16) * (var->xres_virtual / 2) + (var->xoffset / 2); + if (info->var.bits_per_pixel == 0) { + offset = (var->yoffset / 16) * (info->var.xres_virtual / 2) + + (var->xoffset / 2); offset = offset >> 2; } else { offset = (var->yoffset * info->fix.line_length) + - (var->xoffset * var->bits_per_pixel / 8); - offset = offset >> ((var->bits_per_pixel == 4) ? 2 : 3); + (var->xoffset * info->var.bits_per_pixel / 8); + offset = offset >> ((info->var.bits_per_pixel == 4) ? 2 : 3); } /* Set the offset */