aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/via/hw.c2
-rw-r--r--drivers/video/via/share.h1
-rw-r--r--drivers/video/via/viamode.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c
index b8f01103f5c5..56ad185b7b22 100644
--- a/drivers/video/via/hw.c
+++ b/drivers/video/via/hw.c
@@ -2605,7 +2605,7 @@ int viafb_get_refresh(int hres, int vres, u32 long_refresh)
2605 2605
2606 if (abs(best->refresh_rate - long_refresh) > 3) { 2606 if (abs(best->refresh_rate - long_refresh) > 3) {
2607 if (hres == 1200 && vres == 900) 2607 if (hres == 1200 && vres == 900)
2608 return 50; /* OLPC DCON only supports 50 Hz */ 2608 return 49; /* OLPC DCON only supports 50 Hz */
2609 else 2609 else
2610 return 60; 2610 return 60;
2611 } 2611 }
diff --git a/drivers/video/via/share.h b/drivers/video/via/share.h
index 4b7831f0d012..62bed2b12d6e 100644
--- a/drivers/video/via/share.h
+++ b/drivers/video/via/share.h
@@ -290,6 +290,7 @@
290#define HW_LAYOUT_LCD_EXTERNAL_LCD2 0x10 290#define HW_LAYOUT_LCD_EXTERNAL_LCD2 0x10
291 291
292/* Definition Refresh Rate */ 292/* Definition Refresh Rate */
293#define REFRESH_49 49
293#define REFRESH_50 50 294#define REFRESH_50 50
294#define REFRESH_60 60 295#define REFRESH_60 60
295#define REFRESH_75 75 296#define REFRESH_75 75
diff --git a/drivers/video/via/viamode.c b/drivers/video/via/viamode.c
index 260d339b236c..ccb5eec63248 100644
--- a/drivers/video/via/viamode.c
+++ b/drivers/video/via/viamode.c
@@ -606,7 +606,7 @@ static struct crt_mode_table CRTM1200x720[] = {
606/* 1200x900 (DCON) */ 606/* 1200x900 (DCON) */
607static struct crt_mode_table DCON1200x900[] = { 607static struct crt_mode_table DCON1200x900[] = {
608 /* r_rate, hsp, vsp */ 608 /* r_rate, hsp, vsp */
609 {REFRESH_50, M1200X900_R60_HSP, M1200X900_R60_VSP, 609 {REFRESH_49, M1200X900_R60_HSP, M1200X900_R60_VSP,
610 /* The correct htotal is 1240, but this doesn't raster on VX855. */ 610 /* The correct htotal is 1240, but this doesn't raster on VX855. */
611 /* Via suggested changing to a multiple of 16, hence 1264. */ 611 /* Via suggested changing to a multiple of 16, hence 1264. */
612 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 612 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */