| From e2a79affcdc3b27fedd04e7a7c1020e0a2c512ac Mon Sep 17 00:00:00 2001 |
| From: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> |
| Date: Thu, 7 Nov 2013 02:34:12 +0100 |
| Subject: drm/gma500/mrst: Replace WMs and chickenbits with values from EMGD |
| |
| For the minnowboard to work the values found in EMGD are required. |
| This might break Oaktrail but without hardware to test with I cannot |
| really tell (and do not really care). |
| |
| Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> |
| (cherry picked from commit 99d754bb46e41cf88f6e5d96dd3c6c3b9c3bddb3) |
| Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> |
| --- |
| drivers/gpu/drm/gma500/oaktrail_crtc.c | 13 ++++++------- |
| 1 file changed, 6 insertions(+), 7 deletions(-) |
| |
| --- a/drivers/gpu/drm/gma500/oaktrail_crtc.c |
| +++ b/drivers/gpu/drm/gma500/oaktrail_crtc.c |
| @@ -332,16 +332,15 @@ static void oaktrail_crtc_dpms(struct dr |
| break; |
| } |
| |
| - /*Set FIFO Watermarks*/ |
| - REG_WRITE(DSPARB, 0x3FFF); |
| - REG_WRITE(DSPFW1, 0x3F88080A); |
| - REG_WRITE(DSPFW2, 0x0b060808); |
| + /* Set FIFO Watermarks (values taken from EMGD) */ |
| + REG_WRITE(DSPARB, 0x3f80); |
| + REG_WRITE(DSPFW1, 0x3f8f0404); |
| + REG_WRITE(DSPFW2, 0x04040f04); |
| REG_WRITE(DSPFW3, 0x0); |
| - REG_WRITE(DSPFW4, 0x08030404); |
| + REG_WRITE(DSPFW4, 0x04040404); |
| REG_WRITE(DSPFW5, 0x04040404); |
| REG_WRITE(DSPFW6, 0x78); |
| - REG_WRITE(0x70400, REG_READ(0x70400) | 0x4000); |
| - /* Must write Bit 14 of the Chicken Bit Register */ |
| + REG_WRITE(DSPCHICKENBIT, REG_READ(DSPCHICKENBIT) | 0xc040); |
| |
| gma_power_end(dev); |
| } |