From 6c024d3ce46917b123a6ba033513f5c949af847e Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sun, 1 May 2005 08:59:24 -0700 Subject: [PATCH] --- yaml --- r: 775 b: refs/heads/master c: db9f1d9daa2f775a0f7d1a0d2ca4722c1da50158 h: refs/heads/master i: 773: 52d9c5afcef348ba2dee8fab57858016687e1e61 771: 1c4125cb0b4a84aa37036ba733288af27b217ab5 767: 5686ca0dc6cc523e8fabb3ca70e570b027c6d4b0 v: v3 --- [refs] | 2 +- trunk/drivers/video/i810/i810_main.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9914512f7f5a..df10b69c12b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14c6f52f607edd79e2969548c69ec311defdc17d +refs/heads/master: db9f1d9daa2f775a0f7d1a0d2ca4722c1da50158 diff --git a/trunk/drivers/video/i810/i810_main.c b/trunk/drivers/video/i810/i810_main.c index 9ec8781794c0..e04d3e8b2549 100644 --- a/trunk/drivers/video/i810/i810_main.c +++ b/trunk/drivers/video/i810/i810_main.c @@ -999,8 +999,14 @@ static int i810_check_params(struct fb_var_screeninfo *var, info->monspecs.dclkmin = 15000000; if (fb_validate_mode(var, info)) { - if (fb_get_mode(FB_MAXTIMINGS, 0, var, info)) + if (fb_get_mode(FB_MAXTIMINGS, 0, var, info)) { + int default_sync = (hsync1-HFMIN)|(hsync2-HFMAX) + |(vsync1-VFMIN)|(vsync2-VFMAX); + printk("i810fb: invalid video mode%s\n", + default_sync ? "" : + ". Specifying vsyncN/hsyncN parameters may help"); return -EINVAL; + } } var->xres = xres; @@ -2023,10 +2029,10 @@ MODULE_PARM_DESC(vyres, "Virtual vertical resolution in scanlines" " (default = 480)"); module_param(hsync1, int, 0); MODULE_PARM_DESC(hsync1, "Minimum horizontal frequency of monitor in KHz" - " (default = 31)"); + " (default = 29)"); module_param(hsync2, int, 0); MODULE_PARM_DESC(hsync2, "Maximum horizontal frequency of monitor in KHz" - " (default = 31)"); + " (default = 30)"); module_param(vsync1, int, 0); MODULE_PARM_DESC(vsync1, "Minimum vertical frequency of monitor in Hz" " (default = 50)");