Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...

[pandora-kernel.git] / drivers / staging / gma500 / psb_drv.c

diff --git a/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c
index e8334e9..1c45c11 100644 (file)
--- 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)
@@ -870,11 +874,11 @@ static int psb_mode_operation_ioctl(struct drm_device *dev, void *data,
                psb_fb = to_psb_fb(drm_fb);
 
                if (gma_power_begin(dev, 0)) {
-                       REG_WRITE(DSPASURF, psb_fb->offset);
+                       REG_WRITE(DSPASURF, psb_fb->gtt->offset);
                        REG_READ(DSPASURF);
                        gma_power_end(dev);
                } else {
-                       dev_priv->saveDSPASURF = psb_fb->offset;
+                       dev_priv->saveDSPASURF = psb_fb->gtt->offset;
                }
 
                return 0;
@@ -1309,13 +1313,6 @@ static int psb_register_rw_ioctl(struct drm_device *dev, void *data,
        return 0;
 }
 
-/* always available as we are SIGIO'd */
-static unsigned int psb_poll(struct file *filp,
-                            struct poll_table_struct *wait)
-{
-       return POLLIN | POLLRDNORM;
-}
-
 static int psb_driver_open(struct drm_device *dev, struct drm_file *priv)
 {
        return 0;
@@ -1341,29 +1338,9 @@ static long psb_unlocked_ioctl(struct file *filp, unsigned int cmd,
                pm_runtime_allow(&dev->pdev->dev);
                dev_priv->rpm_enabled = 1;
        }
-       /*
-        * The driver private ioctls should be thread-safe.
-        */
-
-       if ((nr >= DRM_COMMAND_BASE) && (nr < DRM_COMMAND_END)
-            && (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls)) {
-               struct drm_ioctl_desc *ioctl =
-                                       &psb_ioctls[nr - DRM_COMMAND_BASE];
-
-               if (unlikely(ioctl->cmd != cmd)) {
-                       DRM_ERROR(
-                               "Invalid drm cmnd %d ioctl->cmd %x, cmd %x\n",
-                               nr - DRM_COMMAND_BASE, ioctl->cmd, cmd);
-                       return -EINVAL;
-               }
-
-               return drm_ioctl(filp, cmd, arg);
-       }
-       /*
-        * Not all old drm ioctls are thread-safe.
-        */
-
        return drm_ioctl(filp, cmd, arg);
+       
+       /* FIXME: do we need to wrap the other side of this */
 }
 
 
@@ -1380,17 +1357,6 @@ static void psb_remove(struct pci_dev *pdev)
        drm_put_dev(dev);
 }
 
-static int psb_open(struct inode *inode, struct file *filp)
-{
-       return 0;
-}
-
-static int psb_release(struct inode *inode, struct file *filp)
-{
-       return 0;
-}
-
-
 static const struct dev_pm_ops psb_pm_ops = {
        .runtime_suspend = psb_runtime_suspend,
        .runtime_resume = psb_runtime_resume,
@@ -1434,14 +1400,14 @@ static struct drm_driver driver = {
 
        .fops = {
                 .owner = THIS_MODULE,
-                .open = psb_open,
-                .release = psb_release,
+                .open = drm_open,
+                .release = drm_release,
                 .unlocked_ioctl = psb_unlocked_ioctl,
-               /* .mmap = psb_mmap, */
-                .poll = psb_poll,
+                .mmap = drm_gem_mmap,
+                .poll = drm_poll,
                 .fasync = drm_fasync,
                 .read = drm_read,
-                },
+        },
        .name = DRIVER_NAME,
        .desc = DRIVER_DESC,
        .date = PSB_DRM_DRIVER_DATE,