evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 into fbdev-fixes-for-linus

Browse source
This commit is contained in:
Paul Mundt 2011-04-19 15:49:36 +09:00
commit 6e4b26805a
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/video/via/hw.c
View file

@ -2598,8 +2598,12 @@ int viafb_get_refresh(int hres, int vres, u32 long_refresh)
best = &vmode->crtc[i]; best = &vmode->crtc[i];
} }
if (abs(best->refresh_rate - long_refresh) > 3) if (abs(best->refresh_rate - long_refresh) > 3) {
return 60; if (hres == 1200 && vres == 900)
return 50; /* OLPC DCON only supports 50 Hz */
else
return 60;
}
return best->refresh_rate; return best->refresh_rate;
} }

2
drivers/video/via/viamode.c
View file

@ -606,7 +606,7 @@ static struct crt_mode_table CRTM1200x720[] = {
/* 1200x900 (DCON) */ /* 1200x900 (DCON) */
static struct crt_mode_table DCON1200x900[] = { static struct crt_mode_table DCON1200x900[] = {
/* r_rate, hsp, vsp */ /* 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. */ /* The correct htotal is 1240, but this doesn't raster on VX855. */
/* Via suggested changing to a multiple of 16, hence 1264. */ /* Via suggested changing to a multiple of 16, hence 1264. */
/* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */