diff options
Diffstat (limited to 'drivers/video/tdfxfb.c')
-rw-r--r-- | drivers/video/tdfxfb.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c index ea9f19d25597..77aafcfae037 100644 --- a/drivers/video/tdfxfb.c +++ b/drivers/video/tdfxfb.c | |||
@@ -836,16 +836,12 @@ static int tdfxfb_pan_display(struct fb_var_screeninfo *var, | |||
836 | struct tdfx_par *par = info->par; | 836 | struct tdfx_par *par = info->par; |
837 | u32 addr = var->yoffset * info->fix.line_length; | 837 | u32 addr = var->yoffset * info->fix.line_length; |
838 | 838 | ||
839 | if (nopan || var->xoffset || (var->yoffset > var->yres_virtual)) | 839 | if (nopan || var->xoffset) |
840 | return -EINVAL; | ||
841 | if ((var->yoffset + var->yres > var->yres_virtual && nowrap)) | ||
842 | return -EINVAL; | 840 | return -EINVAL; |
843 | 841 | ||
844 | banshee_make_room(par, 1); | 842 | banshee_make_room(par, 1); |
845 | tdfx_outl(par, VIDDESKSTART, addr); | 843 | tdfx_outl(par, VIDDESKSTART, addr); |
846 | 844 | ||
847 | info->var.xoffset = var->xoffset; | ||
848 | info->var.yoffset = var->yoffset; | ||
849 | return 0; | 845 | return 0; |
850 | } | 846 | } |
851 | 847 | ||
@@ -1426,6 +1422,8 @@ MODULE_LICENSE("GPL"); | |||
1426 | module_param(hwcursor, int, 0644); | 1422 | module_param(hwcursor, int, 0644); |
1427 | MODULE_PARM_DESC(hwcursor, "Enable hardware cursor " | 1423 | MODULE_PARM_DESC(hwcursor, "Enable hardware cursor " |
1428 | "(1=enable, 0=disable, default=1)"); | 1424 | "(1=enable, 0=disable, default=1)"); |
1425 | module_param(mode_option, charp, 0); | ||
1426 | MODULE_PARM_DESC(mode_option, "Initial video mode e.g. '648x480-8@60'"); | ||
1429 | #ifdef CONFIG_MTRR | 1427 | #ifdef CONFIG_MTRR |
1430 | module_param(nomtrr, bool, 0); | 1428 | module_param(nomtrr, bool, 0); |
1431 | MODULE_PARM_DESC(nomtrr, "Disable MTRR support (default: enabled)"); | 1429 | MODULE_PARM_DESC(nomtrr, "Disable MTRR support (default: enabled)"); |