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

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

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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Ondrej Zajicek <santiago@crfreenet.org>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 3b30f9f4

drivers/video/arkfb.c

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