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

Commit 198a52a1 authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds
Browse files

[PATCH] rivafb: Trim rivafb_pan_display 



Remove error checking and updating from rivafb_pan_display.  This is
guaranteed to be done by the core layer.

Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7227576f

drivers/video/riva/fbdev.c

+0 −24
Original line number Diff line number Diff line
@@ -1209,32 +1209,8 @@ static int rivafb_pan_display(struct fb_var_screeninfo *var, 
	unsigned int base;



	NVTRACE_ENTER();

	if (var->xoffset > (var->xres_virtual - var->xres))

		return -EINVAL;

	if (var->yoffset > (var->yres_virtual - var->yres))

		return -EINVAL;



	if (var->vmode & FB_VMODE_YWRAP) {

		if (var->yoffset < 0

		    || var->yoffset >= info->var.yres_virtual

		    || var->xoffset) return -EINVAL;

	} else {

		if (var->xoffset + info->var.xres > info->var.xres_virtual ||

		    var->yoffset + info->var.yres > info->var.yres_virtual)

			return -EINVAL;

	}



	base = var->yoffset * info->fix.line_length + var->xoffset;



	par->riva.SetStartAddress(&par->riva, base);



	info->var.xoffset = var->xoffset;

	info->var.yoffset = var->yoffset;



	if (var->vmode & FB_VMODE_YWRAP)

		info->var.vmode |= FB_VMODE_YWRAP;

	else

		info->var.vmode &= ~FB_VMODE_YWRAP;

	NVTRACE_LEAVE();

	return 0;

}