diff options
| author | Colin Cross <ccross@android.com> | 2012-03-05 14:17:12 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-03-05 14:17:12 -0800 |
| commit | 91154555190c1d25d02db5240a4cb89d2603c6da (patch) | |
| tree | c86651082158fd88d5c5a71b8fdef36153ece212 /drivers/video/via/hw.c | |
| parent | cd7bc93466877cb1396cbddb4e608252db2a9a3f (diff) | |
| parent | 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d (diff) | |
Merge commit 'v3.3-rc6' into android-3.3
Diffstat (limited to 'drivers/video/via/hw.c')
| -rw-r--r-- | drivers/video/via/hw.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c index d5aaca9cfa7e..8497727d66de 100644 --- a/drivers/video/via/hw.c +++ b/drivers/video/via/hw.c @@ -1810,7 +1810,11 @@ static void hw_init(void) break; } + /* magic required on VX900 for correct modesetting on IGA1 */ + via_write_reg_mask(VIACR, 0x45, 0x00, 0x01); + /* probably this should go to the scaling code one day */ + via_write_reg_mask(VIACR, 0xFD, 0, 0x80); /* VX900 hw scale on IGA2 */ viafb_write_regx(scaling_parameters, ARRAY_SIZE(scaling_parameters)); /* Fill VPIT Parameters */ |