video: fbdev: atari: Simplify atafb_pan_display()
The fb_pan_display() function in the core already takes care of validating the panning parameters before calling the driver's .fb_pan_display() callback, and of updating the panning state afterwards, so there is no need to repeat that in the driver. Remove the duplicate code. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Tested-by: Michael Schmitz <schmitzmic@gmail.com> Signed-off-by: Helge Deller <deller@gmx.de>
This commit is contained in:
committed by
Helge Deller
parent
6a7d270e90
commit
f3bd0c2b63
@@ -2407,35 +2407,10 @@ static void atafb_set_disp(struct fb_info *info)
|
||||
static int
|
||||
atafb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
|
||||
{
|
||||
int xoffset = var->xoffset;
|
||||
int yoffset = var->yoffset;
|
||||
int err;
|
||||
|
||||
if (var->vmode & FB_VMODE_YWRAP) {
|
||||
if (yoffset < 0 || yoffset >= info->var.yres_virtual || xoffset)
|
||||
return -EINVAL;
|
||||
} else {
|
||||
if (xoffset + info->var.xres > info->var.xres_virtual ||
|
||||
yoffset + info->var.yres > info->var.yres_virtual)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (fbhw->pan_display) {
|
||||
err = fbhw->pan_display(var, info);
|
||||
if (err)
|
||||
return err;
|
||||
} else
|
||||
if (!fbhw->pan_display)
|
||||
return -EINVAL;
|
||||
|
||||
info->var.xoffset = xoffset;
|
||||
info->var.yoffset = yoffset;
|
||||
|
||||
if (var->vmode & FB_VMODE_YWRAP)
|
||||
info->var.vmode |= FB_VMODE_YWRAP;
|
||||
else
|
||||
info->var.vmode &= ~FB_VMODE_YWRAP;
|
||||
|
||||
return 0;
|
||||
return fbhw->pan_display(var, info);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user