aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/gma500
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.jf.intel.com>2011-05-06 16:48:27 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-06 09:27:35 -0700
commitb644c7ce18e11ef76830f5dce59402c6c9e07517 (patch)
treeb58d48885630be4c96b935d4f746c68494bb3160 /drivers/staging/gma500
parent9fada0a0c5d4f51064e20b3a4fb15437992757cd (diff)
downloadkernel_samsung_smdk4412-b644c7ce18e11ef76830f5dce59402c6c9e07517.zip
kernel_samsung_smdk4412-b644c7ce18e11ef76830f5dce59402c6c9e07517.tar.gz
kernel_samsung_smdk4412-b644c7ce18e11ef76830f5dce59402c6c9e07517.tar.bz2
gma500: The MID devices have the register offset different
This is another small step towards getting Moorestown/Oaktrail support to work but for Moorestown at least we still need to sort out GEM backed base framebuffer, which means figuring out why GEM explodes early on at the moment. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/gma500')
-rw-r--r--drivers/staging/gma500/psb_drv.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c
index f98f4f4..4d0d1fe 100644
--- a/drivers/staging/gma500/psb_drv.c
+++ b/drivers/staging/gma500/psb_drv.c
@@ -565,7 +565,11 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
if (!dev_priv->vdc_reg)
goto out_err;
- dev_priv->sgx_reg = ioremap(resource_start + PSB_SGX_OFFSET,
+ if (IS_MRST(dev))
+ dev_priv->sgx_reg = ioremap(resource_start + MRST_SGX_OFFSET,
+ PSB_SGX_SIZE);
+ else
+ dev_priv->sgx_reg = ioremap(resource_start + PSB_SGX_OFFSET,
PSB_SGX_SIZE);
if (!dev_priv->sgx_reg)