aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/intelfb
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2011-05-25 05:34:52 -0400
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2011-08-19 04:32:31 -0400
commitf5b9cc6a66feee205609ef98b1f5a51168c26b74 (patch)
tree4562f2d95a40895455123172a69723041dd728d5 /drivers/video/intelfb
parent09a9168d4c3f3bf3b0f9306966379df500f201d2 (diff)
intelfb: 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/intelfb')
-rw-r--r--drivers/video/intelfb/intelfbhw.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index 38065cf94ac4..fbad61da359f 100644
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -390,12 +390,12 @@ int intelfbhw_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
390 xoffset = ROUND_DOWN_TO(var->xoffset, 8); 390 xoffset = ROUND_DOWN_TO(var->xoffset, 8);
391 yoffset = var->yoffset; 391 yoffset = var->yoffset;
392 392
393 if ((xoffset + var->xres > var->xres_virtual) || 393 if ((xoffset + info->var.xres > info->var.xres_virtual) ||
394 (yoffset + var->yres > var->yres_virtual)) 394 (yoffset + info->var.yres > info->var.yres_virtual))
395 return -EINVAL; 395 return -EINVAL;
396 396
397 offset = (yoffset * dinfo->pitch) + 397 offset = (yoffset * dinfo->pitch) +
398 (xoffset * var->bits_per_pixel) / 8; 398 (xoffset * info->var.bits_per_pixel) / 8;
399 399
400 offset += dinfo->fb.offset << 12; 400 offset += dinfo->fb.offset << 12;
401 401