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>
This commit is contained in:
Laurent Pinchart 2011-05-25 11:34:52 +02:00
Родитель b3e9c12949
Коммит 0e03f856d2
1 изменённых файлов: 5 добавлений и 5 удалений

Просмотреть файл

@ -845,16 +845,16 @@ static int radeonfb_pan_display (struct fb_var_screeninfo *var,
{ {
struct radeonfb_info *rinfo = info->par; struct radeonfb_info *rinfo = info->par;
if ((var->xoffset + var->xres > var->xres_virtual) if ((var->xoffset + info->var.xres > info->var.xres_virtual)
|| (var->yoffset + var->yres > var->yres_virtual)) || (var->yoffset + info->var.yres > info->var.yres_virtual))
return -EINVAL; return -EINVAL;
if (rinfo->asleep) if (rinfo->asleep)
return 0; return 0;
radeon_fifo_wait(2); radeon_fifo_wait(2);
OUTREG(CRTC_OFFSET, ((var->yoffset * var->xres_virtual + var->xoffset) OUTREG(CRTC_OFFSET, (var->yoffset * info->fix.line_length +
* var->bits_per_pixel / 8) & ~7); var->xoffset * info->var.bits_per_pixel / 8) & ~7);
return 0; return 0;
} }