Commit c2c12155 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds

tdfxfb: remove ypan checks done by a higher layer

These checks and assignments are done by a higher layer so remove them
from the driver.
Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 98219374
...@@ -836,16 +836,12 @@ static int tdfxfb_pan_display(struct fb_var_screeninfo *var, ...@@ -836,16 +836,12 @@ static int tdfxfb_pan_display(struct fb_var_screeninfo *var,
struct tdfx_par *par = info->par; struct tdfx_par *par = info->par;
u32 addr = var->yoffset * info->fix.line_length; u32 addr = var->yoffset * info->fix.line_length;
if (nopan || var->xoffset || (var->yoffset > var->yres_virtual)) if (nopan || var->xoffset)
return -EINVAL;
if ((var->yoffset + var->yres > var->yres_virtual && nowrap))
return -EINVAL; return -EINVAL;
banshee_make_room(par, 1); banshee_make_room(par, 1);
tdfx_outl(par, VIDDESKSTART, addr); tdfx_outl(par, VIDDESKSTART, addr);
info->var.xoffset = var->xoffset;
info->var.yoffset = var->yoffset;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment