diff options
| author | Antonino A. Daplas <adaplas@gmail.com> | 2006-01-09 20:53:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 08:01:46 -0800 |
| commit | 198a52a1c490be89a8d5d130eda972630919e0af (patch) | |
| tree | f27d8f7b9fd962262b39cf1a7a95d12fb3c143d0 /drivers | |
| parent | 7227576f4b9dcffe32f8e6b228361b38814bbe7f (diff) | |
| download | linux-198a52a1c490be89a8d5d130eda972630919e0af.tar.gz | |
[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: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/riva/fbdev.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index dd7b2cc888257d..6c19ab6afb015f 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c @@ -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; } |