1 files changed, 41 insertions, 15 deletions

diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index a9c5716bea4e..06da063ece2e 100644
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
@@ -48,9 +48,7 @@ static int sis_driver_load(struct drm_device *dev, unsigned long chipset)
 
         dev->dev_private = (void *)dev_priv;
         dev_priv->chipset = chipset;
-        ret = drm_sman_init(&dev_priv->sman, 2, 12, 8);
-        if (ret)
-                kfree(dev_priv);
+        idr_init(&dev->object_name_idr);
 
         return ret;
 }
@@ -59,32 +57,60 @@ static int sis_driver_unload(struct drm_device *dev)
 {
         drm_sis_private_t *dev_priv = dev->dev_private;
 
-        drm_sman_takedown(&dev_priv->sman);
+        idr_remove_all(&dev_priv->object_idr);
+        idr_destroy(&dev_priv->object_idr);
+
         kfree(dev_priv);
 
         return 0;
 }
 
+static const struct file_operations sis_driver_fops = {
+        .owner = THIS_MODULE,
+        .open = drm_open,
+        .release = drm_release,
+        .unlocked_ioctl = drm_ioctl,
+        .mmap = drm_mmap,
+        .poll = drm_poll,
+        .fasync = drm_fasync,
+        .llseek = noop_llseek,
+};
+
+static int sis_driver_open(struct drm_device *dev, struct drm_file *file)
+{
+        struct sis_file_private *file_priv;
+
+        DRM_DEBUG_DRIVER("\n");
+        file_priv = kmalloc(sizeof(*file_priv), GFP_KERNEL);
+        if (!file_priv)
+                return -ENOMEM;
+
+        file->driver_priv = file_priv;
+
+        INIT_LIST_HEAD(&file_priv->obj_list);
+
+        return 0;
+}
+
+void sis_driver_postclose(struct drm_device *dev, struct drm_file *file)
+{
+        struct sis_file_private *file_priv = file->driver_priv;
+
+        kfree(file_priv);
+}
+
 static struct drm_driver driver = {
         .driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR,
         .load = sis_driver_load,
         .unload = sis_driver_unload,
+        .open = sis_driver_open,
+        .postclose = sis_driver_postclose,
         .dma_quiescent = sis_idle,
         .reclaim_buffers = NULL,
         .reclaim_buffers_idlelocked = sis_reclaim_buffers_locked,
         .lastclose = sis_lastclose,
         .ioctls = sis_ioctls,
-        .fops = {
-                 .owner = THIS_MODULE,
-                 .open = drm_open,
-                 .release = drm_release,
-                 .unlocked_ioctl = drm_ioctl,
-                 .mmap = drm_mmap,
-                 .poll = drm_poll,
-                 .fasync = drm_fasync,
-                 .llseek = noop_llseek,
-        },
-
+        .fops = &sis_driver_fops,
         .name = DRIVER_NAME,
         .desc = DRIVER_DESC,
         .date = DRIVER_DATE,