Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 775
b: refs/heads/master
c: db9f1d9
h: refs/heads/master
i:
  773: 52d9c5a
  771: 1c4125c
  767: 5686ca0
v: v3
  • Loading branch information
Denis Vlasenko authored and Linus Torvalds committed May 1, 2005
1 parent 949e138 commit 6c024d3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 14c6f52f607edd79e2969548c69ec311defdc17d
refs/heads/master: db9f1d9daa2f775a0f7d1a0d2ca4722c1da50158
12 changes: 9 additions & 3 deletions trunk/drivers/video/i810/i810_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)");
Expand Down

0 comments on commit 6c024d3

Please sign in to comment.