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:29:44 +0200 |
| commit | a35a9b79dd44b36b688c493610dfbbdb42aff136 (patch) | |
| tree | 00adcf18843f56a0fe19f60aee8241c02888f374 /drivers/video/arkfb.c | |
| parent | acornfb: use display information in info not in var for panning (diff) | |
| download | linux-dev-a35a9b79dd44b36b688c493610dfbbdb42aff136.tar.xz linux-dev-a35a9b79dd44b36b688c493610dfbbdb42aff136.zip | |
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 <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'drivers/video/arkfb.c')
| -rw-r--r-- | drivers/video/arkfb.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c index 8686429cbdf0..555dd4c64f5b 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 */ |