diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-04-19 06:49:36 (GMT) |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-04-19 06:49:36 (GMT) |
| commit | 6e4b26805a90b6682dd4ea0fd426dcda8ca5164a (patch) | |
| tree | 3067c305a35dcaf2a2542c5c1c100b657ddd21be | |
| parent | 9b6d7777118d3f2abc39591481ea5b9b5e76d6ba (diff) | |
| parent | b4ce6a285b65be4fb858728b3bbe9011242b769f (diff) | |
| download | linux-6e4b26805a90b6682dd4ea0fd426dcda8ca5164a.tar.xz | |
Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 into fbdev-fixes-for-linus
| -rw-r--r-- | drivers/video/via/hw.c | 8 | ||||
| -rw-r--r-- | drivers/video/via/viamode.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c index dc4c778..980e263 100644 --- a/drivers/video/via/hw.c +++ b/drivers/video/via/hw.c @@ -2598,8 +2598,12 @@ int viafb_get_refresh(int hres, int vres, u32 long_refresh) best = &vmode->crtc[i]; } - if (abs(best->refresh_rate - long_refresh) > 3) - return 60; + if (abs(best->refresh_rate - long_refresh) > 3) { + if (hres == 1200 && vres == 900) + return 50; /* OLPC DCON only supports 50 Hz */ + else + return 60; + } return best->refresh_rate; } diff --git a/drivers/video/via/viamode.c b/drivers/video/via/viamode.c index 8c5bc41..260d339 100644 --- a/drivers/video/via/viamode.c +++ b/drivers/video/via/viamode.c @@ -606,7 +606,7 @@ static struct crt_mode_table CRTM1200x720[] = { /* 1200x900 (DCON) */ static struct crt_mode_table DCON1200x900[] = { /* r_rate, hsp, vsp */ - {REFRESH_60, M1200X900_R60_HSP, M1200X900_R60_VSP, + {REFRESH_50, M1200X900_R60_HSP, M1200X900_R60_VSP, /* The correct htotal is 1240, but this doesn't raster on VX855. */ /* Via suggested changing to a multiple of 16, hence 1264. */ /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ |