From b644c7ce18e11ef76830f5dce59402c6c9e07517 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 6 May 2011 16:48:27 +0100 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/gma500/psb_drv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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) -- 2.7.4