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:30:16 +0200 |
| commit | 0e03f856d2383a5428cf6de516b73d2b40841ced (patch) | |
| tree | 4330edd227ad550d9356300a72d59d49c07a312f | |
| parent | b3e9c12949c1e66f3190e430ad096e53df4e1328 (diff) | |
| download | linux-3.10-0e03f856d2383a5428cf6de516b73d2b40841ced.tar.gz linux-3.10-0e03f856d2383a5428cf6de516b73d2b40841ced.tar.bz2 linux-3.10-0e03f856d2383a5428cf6de516b73d2b40841ced.zip | |
radeonfb: 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>
| -rw-r--r-- | drivers/video/aty/radeon_base.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index 32f8cf6200a..150684882ef 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c @@ -845,16 +845,16 @@ static int radeonfb_pan_display (struct fb_var_screeninfo *var, { struct radeonfb_info *rinfo = info->par; - if ((var->xoffset + var->xres > var->xres_virtual) - || (var->yoffset + var->yres > var->yres_virtual)) - return -EINVAL; + if ((var->xoffset + info->var.xres > info->var.xres_virtual) + || (var->yoffset + info->var.yres > info->var.yres_virtual)) + return -EINVAL; if (rinfo->asleep) return 0; radeon_fifo_wait(2); - OUTREG(CRTC_OFFSET, ((var->yoffset * var->xres_virtual + var->xoffset) - * var->bits_per_pixel / 8) & ~7); + OUTREG(CRTC_OFFSET, (var->yoffset * info->fix.line_length + + var->xoffset * info->var.bits_per_pixel / 8) & ~7); return 0; } |