Commit 305e0e4d authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

s3fb: 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>
parent d8e7a74b

drivers/video/s3fb.c

+4 −3
Original line number Diff line number Diff line
@@ -1019,12 +1019,13 @@ static int s3fb_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);

			 (var->xoffset * info->var.bits_per_pixel / 8);

		offset = offset >> 2;

	}