Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff55fe9a authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Paul Mundt
Browse files

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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 4d3c68a1

drivers/video/aty/radeon_base.c

+5 −5
Original line number Diff line number Diff line
@@ -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))

	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;

}