Patched in Tegra support.

3 files changed, 117 insertions, 187 deletions

diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index 841065b998a..46d5be6e97e 100644
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
@@ -25,13 +25,11 @@
  *
  */
 
-#include <linux/module.h>
-
-#include <drm/drmP.h>
-#include <drm/sis_drm.h>
+#include "drmP.h"
+#include "sis_drm.h"
 #include "sis_drv.h"
 
-#include <drm/drm_pciids.h>
+#include "drm_pciids.h"
 
 static struct pci_device_id pciidlist[] = {
         sisdrv_PCI_IDS
@@ -40,80 +38,51 @@ static struct pci_device_id pciidlist[] = {
 static int sis_driver_load(struct drm_device *dev, unsigned long chipset)
 {
         drm_sis_private_t *dev_priv;
-
-        pci_set_master(dev->pdev);
+        int ret;
 
         dev_priv = kzalloc(sizeof(drm_sis_private_t), GFP_KERNEL);
         if (dev_priv == NULL)
                 return -ENOMEM;
 
-        idr_init(&dev_priv->object_idr);
         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);
 
-        return 0;
+        return ret;
 }
 
 static int sis_driver_unload(struct drm_device *dev)
 {
         drm_sis_private_t *dev_priv = dev->dev_private;
 
-        idr_remove_all(&dev_priv->object_idr);
-        idr_destroy(&dev_priv->object_idr);
-
+        drm_sman_takedown(&dev_priv->sman);
         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,
-#ifdef CONFIG_COMPAT
-        .compat_ioctl = drm_compat_ioctl,
-#endif
-        .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,
-        .preclose = sis_reclaim_buffers_locked,
-        .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 = &sis_driver_fops,
+        .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,
+        },
+
         .name = DRIVER_NAME,
         .desc = DRIVER_DESC,
         .date = DRIVER_DATE,
diff --git a/drivers/gpu/drm/sis/sis_drv.h b/drivers/gpu/drm/sis/sis_drv.h
index 13b527bb83b..194303c177a 100644
--- a/drivers/gpu/drm/sis/sis_drv.h
+++ b/drivers/gpu/drm/sis/sis_drv.h
@@ -44,7 +44,7 @@ enum sis_family {
         SIS_CHIP_315 = 1,
 };
 
-#include <drm/drm_mm.h>
+#include "drm_sman.h"
 
 
 #define SIS_BASE (dev_priv->mmio)
@@ -54,15 +54,12 @@ enum sis_family {
 typedef struct drm_sis_private {
         drm_local_map_t *mmio;
         unsigned int idle_fault;
+        struct drm_sman sman;
         unsigned int chipset;
         int vram_initialized;
         int agp_initialized;
         unsigned long vram_offset;
         unsigned long agp_offset;
-        struct drm_mm vram_mm;
-        struct drm_mm agp_mm;
-        /** Mapping of userspace keys to mm objects */
-        struct idr object_idr;
 } drm_sis_private_t;
 
 extern int sis_idle(struct drm_device *dev);
diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c
index 2b2f78c428a..7fe2b63412c 100644
--- a/drivers/gpu/drm/sis/sis_mm.c
+++ b/drivers/gpu/drm/sis/sis_mm.c
@@ -31,8 +31,8 @@
  *    Thomas Hellström <thomas-at-tungstengraphics-dot-com>
  */
 
-#include <drm/drmP.h>
-#include <drm/sis_drm.h>
+#include "drmP.h"
+#include "sis_drm.h"
 #include "sis_drv.h"
 
 #include <video/sisfb.h>
@@ -41,18 +41,40 @@
 #define AGP_TYPE 1
 
 
-struct sis_memblock {
-        struct drm_mm_node mm_node;
-        struct sis_memreq req;
-        struct list_head owner_list;
-};
-
 #if defined(CONFIG_FB_SIS) || defined(CONFIG_FB_SIS_MODULE)
 /* fb management via fb device */
 
 #define SIS_MM_ALIGN_SHIFT 0
 #define SIS_MM_ALIGN_MASK 0
 
+static void *sis_sman_mm_allocate(void *private, unsigned long size,
+                                  unsigned alignment)
+{
+        struct sis_memreq req;
+
+        req.size = size;
+        sis_malloc(&req);
+        if (req.size == 0)
+                return NULL;
+        else
+                return (void *)(unsigned long)~req.offset;
+}
+
+static void sis_sman_mm_free(void *private, void *ref)
+{
+        sis_free(~((unsigned long)ref));
+}
+
+static void sis_sman_mm_destroy(void *private)
+{
+        ;
+}
+
+static unsigned long sis_sman_mm_offset(void *private, void *ref)
+{
+        return ~((unsigned long)ref);
+}
+
 #else /* CONFIG_FB_SIS[_MODULE] */
 
 #define SIS_MM_ALIGN_SHIFT 4
@@ -64,30 +86,47 @@ static int sis_fb_init(struct drm_device *dev, void *data, struct drm_file *file
 {
         drm_sis_private_t *dev_priv = dev->dev_private;
         drm_sis_fb_t *fb = data;
+        int ret;
 
         mutex_lock(&dev->struct_mutex);
-        /* Unconditionally init the drm_mm, even though we don't use it when the
-         * fb sis driver is available - make cleanup easier. */
-        drm_mm_init(&dev_priv->vram_mm, 0, fb->size >> SIS_MM_ALIGN_SHIFT);
+#if defined(CONFIG_FB_SIS) || defined(CONFIG_FB_SIS_MODULE)
+        {
+                struct drm_sman_mm sman_mm;
+                sman_mm.private = (void *)0xFFFFFFFF;
+                sman_mm.allocate = sis_sman_mm_allocate;
+                sman_mm.free = sis_sman_mm_free;
+                sman_mm.destroy = sis_sman_mm_destroy;
+                sman_mm.offset = sis_sman_mm_offset;
+                ret =
+                    drm_sman_set_manager(&dev_priv->sman, VIDEO_TYPE, &sman_mm);
+        }
+#else
+        ret = drm_sman_set_range(&dev_priv->sman, VIDEO_TYPE, 0,
+                                 fb->size >> SIS_MM_ALIGN_SHIFT);
+#endif
+
+        if (ret) {
+                DRM_ERROR("VRAM memory manager initialisation error\n");
+                mutex_unlock(&dev->struct_mutex);
+                return ret;
+        }
 
         dev_priv->vram_initialized = 1;
         dev_priv->vram_offset = fb->offset;
 
         mutex_unlock(&dev->struct_mutex);
-        DRM_DEBUG("offset = %lu, size = %lu\n", fb->offset, fb->size);
+        DRM_DEBUG("offset = %u, size = %u\n", fb->offset, fb->size);
 
         return 0;
 }
 
-static int sis_drm_alloc(struct drm_device *dev, struct drm_file *file,
+static int sis_drm_alloc(struct drm_device *dev, struct drm_file *file_priv,
                          void *data, int pool)
 {
         drm_sis_private_t *dev_priv = dev->dev_private;
         drm_sis_mem_t *mem = data;
-        int retval = 0, user_key;
-        struct sis_memblock *item;
-        struct sis_file_private *file_priv = file->driver_priv;
-        unsigned long offset;
+        int retval = 0;
+        struct drm_memblock_item *item;
 
         mutex_lock(&dev->struct_mutex);
 
@@ -99,69 +138,26 @@ static int sis_drm_alloc(struct drm_device *dev, struct drm_file *file,
                 return -EINVAL;
         }
 
-        item = kzalloc(sizeof(*item), GFP_KERNEL);
-        if (!item) {
-                retval = -ENOMEM;
-                goto fail_alloc;
-        }
-
         mem->size = (mem->size + SIS_MM_ALIGN_MASK) >> SIS_MM_ALIGN_SHIFT;
-        if (pool == AGP_TYPE) {
-                retval = drm_mm_insert_node(&dev_priv->agp_mm,
-                                            &item->mm_node,
-                                            mem->size, 0);
-                offset = item->mm_node.start;
-        } else {
-#if defined(CONFIG_FB_SIS) || defined(CONFIG_FB_SIS_MODULE)
-                item->req.size = mem->size;
-                sis_malloc(&item->req);
-                if (item->req.size == 0)
-                        retval = -ENOMEM;
-                offset = item->req.offset;
-#else
-                retval = drm_mm_insert_node(&dev_priv->vram_mm,
-                                            &item->mm_node,
-                                            mem->size, 0);
-                offset = item->mm_node.start;
-#endif
-        }
-        if (retval)
-                goto fail_alloc;
+        item = drm_sman_alloc(&dev_priv->sman, pool, mem->size, 0,
+                              (unsigned long)file_priv);
 
-again:
-        if (idr_pre_get(&dev_priv->object_idr, GFP_KERNEL) == 0) {
+        mutex_unlock(&dev->struct_mutex);
+        if (item) {
+                mem->offset = ((pool == 0) ?
+                              dev_priv->vram_offset : dev_priv->agp_offset) +
+                    (item->mm->
+                     offset(item->mm, item->mm_info) << SIS_MM_ALIGN_SHIFT);
+                mem->free = item->user_hash.key;
+                mem->size = mem->size << SIS_MM_ALIGN_SHIFT;
+        } else {
+                mem->offset = 0;
+                mem->size = 0;
+                mem->free = 0;
                 retval = -ENOMEM;
-                goto fail_idr;
         }
 
-        retval = idr_get_new_above(&dev_priv->object_idr, item, 1, &user_key);
-        if (retval == -EAGAIN)
-                goto again;
-        if (retval)
-                goto fail_idr;
-
-        list_add(&item->owner_list, &file_priv->obj_list);
-        mutex_unlock(&dev->struct_mutex);
-
-        mem->offset = ((pool == 0) ?
-                      dev_priv->vram_offset : dev_priv->agp_offset) +
-            (offset << SIS_MM_ALIGN_SHIFT);
-        mem->free = user_key;
-        mem->size = mem->size << SIS_MM_ALIGN_SHIFT;
-
-        return 0;
-
-fail_idr:
-        drm_mm_remove_node(&item->mm_node);
-fail_alloc:
-        kfree(item);
-        mutex_unlock(&dev->struct_mutex);
-
-        mem->offset = 0;
-        mem->size = 0;
-        mem->free = 0;
-
-        DRM_DEBUG("alloc %d, size = %ld, offset = %ld\n", pool, mem->size,
+        DRM_DEBUG("alloc %d, size = %d, offset = %d\n", pool, mem->size,
                   mem->offset);
 
         return retval;
@@ -171,28 +167,14 @@ static int sis_drm_free(struct drm_device *dev, void *data, struct drm_file *fil
 {
         drm_sis_private_t *dev_priv = dev->dev_private;
         drm_sis_mem_t *mem = data;
-        struct sis_memblock *obj;
+        int ret;
 
         mutex_lock(&dev->struct_mutex);
-        obj = idr_find(&dev_priv->object_idr, mem->free);
-        if (obj == NULL) {
-                mutex_unlock(&dev->struct_mutex);
-                return -EINVAL;
-        }
-
-        idr_remove(&dev_priv->object_idr, mem->free);
-        list_del(&obj->owner_list);
-        if (drm_mm_node_allocated(&obj->mm_node))
-                drm_mm_remove_node(&obj->mm_node);
-#if defined(CONFIG_FB_SIS) || defined(CONFIG_FB_SIS_MODULE)
-        else
-                sis_free(obj->req.offset);
-#endif
-        kfree(obj);
+        ret = drm_sman_free_key(&dev_priv->sman, mem->free);
         mutex_unlock(&dev->struct_mutex);
         DRM_DEBUG("free = 0x%lx\n", mem->free);
 
-        return 0;
+        return ret;
 }
 
 static int sis_fb_alloc(struct drm_device *dev, void *data,
@@ -206,16 +188,24 @@ static int sis_ioctl_agp_init(struct drm_device *dev, void *data,
 {
         drm_sis_private_t *dev_priv = dev->dev_private;
         drm_sis_agp_t *agp = data;
+        int ret;
         dev_priv = dev->dev_private;
 
         mutex_lock(&dev->struct_mutex);
-        drm_mm_init(&dev_priv->agp_mm, 0, agp->size >> SIS_MM_ALIGN_SHIFT);
+        ret = drm_sman_set_range(&dev_priv->sman, AGP_TYPE, 0,
+                                 agp->size >> SIS_MM_ALIGN_SHIFT);
+
+        if (ret) {
+                DRM_ERROR("AGP memory manager initialisation error\n");
+                mutex_unlock(&dev->struct_mutex);
+                return ret;
+        }
 
         dev_priv->agp_initialized = 1;
         dev_priv->agp_offset = agp->offset;
         mutex_unlock(&dev->struct_mutex);
 
-        DRM_DEBUG("offset = %lu, size = %lu\n", agp->offset, agp->size);
+        DRM_DEBUG("offset = %u, size = %u\n", agp->offset, agp->size);
         return 0;
 }
 
@@ -303,55 +293,29 @@ void sis_lastclose(struct drm_device *dev)
                 return;
 
         mutex_lock(&dev->struct_mutex);
-        if (dev_priv->vram_initialized) {
-                drm_mm_takedown(&dev_priv->vram_mm);
-                dev_priv->vram_initialized = 0;
-        }
-        if (dev_priv->agp_initialized) {
-                drm_mm_takedown(&dev_priv->agp_mm);
-                dev_priv->agp_initialized = 0;
-        }
+        drm_sman_cleanup(&dev_priv->sman);
+        dev_priv->vram_initialized = 0;
+        dev_priv->agp_initialized = 0;
         dev_priv->mmio = NULL;
         mutex_unlock(&dev->struct_mutex);
 }
 
 void sis_reclaim_buffers_locked(struct drm_device *dev,
-                                struct drm_file *file)
+                                struct drm_file *file_priv)
 {
-        struct sis_file_private *file_priv = file->driver_priv;
-        struct sis_memblock *entry, *next;
-
-        if (!(file->minor->master && file->master->lock.hw_lock))
-                return;
-
-        drm_idlelock_take(&file->master->lock);
+        drm_sis_private_t *dev_priv = dev->dev_private;
 
         mutex_lock(&dev->struct_mutex);
-        if (list_empty(&file_priv->obj_list)) {
+        if (drm_sman_owner_clean(&dev_priv->sman, (unsigned long)file_priv)) {
                 mutex_unlock(&dev->struct_mutex);
-                drm_idlelock_release(&file->master->lock);
-
                 return;
         }
 
-        sis_idle(dev);
+        if (dev->driver->dma_quiescent)
+                dev->driver->dma_quiescent(dev);
 
-
-        list_for_each_entry_safe(entry, next, &file_priv->obj_list,
-                                 owner_list) {
-                list_del(&entry->owner_list);
-                if (drm_mm_node_allocated(&entry->mm_node))
-                        drm_mm_remove_node(&entry->mm_node);
-#if defined(CONFIG_FB_SIS) || defined(CONFIG_FB_SIS_MODULE)
-                else
-                        sis_free(entry->req.offset);
-#endif
-                kfree(entry);
-        }
+        drm_sman_owner_cleanup(&dev_priv->sman, (unsigned long)file_priv);
         mutex_unlock(&dev->struct_mutex);
-
-        drm_idlelock_release(&file->master->lock);
-
         return;
 }