diff options
| author | Alan Cox <alan@linux.intel.com> | 2012-09-12 10:05:04 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-09-13 11:36:29 +1000 |
| commit | 26df641eac05abe1a3276eea441359b4d1120816 (patch) | |
| tree | 14969453a122cd3a4a284dc160b523640d7dd95b /drivers/gpu/drm/gma500/oaktrail_device.c | |
| parent | 6426a7b0d9e9756f09fad52a1200525d62fb8396 (diff) | |
| download | op-kernel-dev-26df641eac05abe1a3276eea441359b4d1120816.zip op-kernel-dev-26df641eac05abe1a3276eea441359b4d1120816.tar.gz | |
gma500: Fix regression on Oaktrail devices
The register map patches didn't set one value for the GMA600 which
means the Fujitsu Q550 dies on boot with the GMA500 driver enabled.
Add the map entry so we don't read from the device MMIO + 0 by mistake.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: Horses <stable@vger.kernel.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/gma500/oaktrail_device.c')
| -rw-r--r-- | drivers/gpu/drm/gma500/oaktrail_device.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/gma500/oaktrail_device.c b/drivers/gpu/drm/gma500/oaktrail_device.c index 0f9b7db..cf49ba5 100644 --- a/drivers/gpu/drm/gma500/oaktrail_device.c +++ b/drivers/gpu/drm/gma500/oaktrail_device.c @@ -476,6 +476,7 @@ static const struct psb_offset oaktrail_regmap[2] = { .pos = DSPAPOS, .surf = DSPASURF, .addr = MRST_DSPABASE, + .base = MRST_DSPABASE, .status = PIPEASTAT, .linoff = DSPALINOFF, .tileoff = DSPATILEOFF, @@ -499,6 +500,7 @@ static const struct psb_offset oaktrail_regmap[2] = { .pos = DSPBPOS, .surf = DSPBSURF, .addr = DSPBBASE, + .base = DSPBBASE, .status = PIPEBSTAT, .linoff = DSPBLINOFF, .tileoff = DSPBTILEOFF, |
