Patched in Tegra support.

1 files changed, 50 insertions, 102 deletions

diff --git a/drivers/gpu/drm/via/via_mm.c b/drivers/gpu/drm/via/via_mm.c
index 0d55432e02a..6cc2dadae3e 100644
--- a/drivers/gpu/drm/via/via_mm.c
+++ b/drivers/gpu/drm/via/via_mm.c
@@ -25,25 +25,29 @@
  * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
  */
 
-#include <drm/drmP.h>
-#include <drm/via_drm.h>
+#include "drmP.h"
+#include "via_drm.h"
 #include "via_drv.h"
+#include "drm_sman.h"
 
 #define VIA_MM_ALIGN_SHIFT 4
 #define VIA_MM_ALIGN_MASK ((1 << VIA_MM_ALIGN_SHIFT) - 1)
 
-struct via_memblock {
-        struct drm_mm_node mm_node;
-        struct list_head owner_list;
-};
-
 int via_agp_init(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
         drm_via_agp_t *agp = data;
         drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
+        int ret;
 
         mutex_lock(&dev->struct_mutex);
-        drm_mm_init(&dev_priv->agp_mm, 0, agp->size >> VIA_MM_ALIGN_SHIFT);
+        ret = drm_sman_set_range(&dev_priv->sman, VIA_MEM_AGP, 0,
+                                 agp->size >> VIA_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;
@@ -57,9 +61,17 @@ int via_fb_init(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
         drm_via_fb_t *fb = data;
         drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
+        int ret;
 
         mutex_lock(&dev->struct_mutex);
-        drm_mm_init(&dev_priv->vram_mm, 0, fb->size >> VIA_MM_ALIGN_SHIFT);
+        ret = drm_sman_set_range(&dev_priv->sman, VIA_MEM_VIDEO, 0,
+                                 fb->size >> VIA_MM_ALIGN_SHIFT);
+
+        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;
@@ -96,25 +108,19 @@ void via_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;
         mutex_unlock(&dev->struct_mutex);
 }
 
 int via_mem_alloc(struct drm_device *dev, void *data,
-                  struct drm_file *file)
+                  struct drm_file *file_priv)
 {
         drm_via_mem_t *mem = data;
-        int retval = 0, user_key;
-        struct via_memblock *item;
+        int retval = 0;
+        struct drm_memblock_item *item;
         drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
-        struct via_file_private *file_priv = file->driver_priv;
         unsigned long tmpSize;
 
         if (mem->type > VIA_MEM_AGP) {
@@ -130,57 +136,24 @@ int via_mem_alloc(struct drm_device *dev, void *data,
                 return -EINVAL;
         }
 
-        item = kzalloc(sizeof(*item), GFP_KERNEL);
-        if (!item) {
-                retval = -ENOMEM;
-                goto fail_alloc;
-        }
-
         tmpSize = (mem->size + VIA_MM_ALIGN_MASK) >> VIA_MM_ALIGN_SHIFT;
-        if (mem->type == VIA_MEM_AGP)
-                retval = drm_mm_insert_node(&dev_priv->agp_mm,
-                                            &item->mm_node,
-                                            tmpSize, 0);
-        else
-                retval = drm_mm_insert_node(&dev_priv->vram_mm,
-                                            &item->mm_node,
-                                            tmpSize, 0);
-        if (retval)
-                goto fail_alloc;
-
-again:
-        if (idr_pre_get(&dev_priv->object_idr, GFP_KERNEL) == 0) {
+        item = drm_sman_alloc(&dev_priv->sman, mem->type, tmpSize, 0,
+                              (unsigned long)file_priv);
+        mutex_unlock(&dev->struct_mutex);
+        if (item) {
+                mem->offset = ((mem->type == VIA_MEM_VIDEO) ?
+                              dev_priv->vram_offset : dev_priv->agp_offset) +
+                    (item->mm->
+                     offset(item->mm, item->mm_info) << VIA_MM_ALIGN_SHIFT);
+                mem->index = item->user_hash.key;
+        } else {
+                mem->offset = 0;
+                mem->size = 0;
+                mem->index = 0;
+                DRM_DEBUG("Video memory allocation failed\n");
                 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 = ((mem->type == VIA_MEM_VIDEO) ?
-                      dev_priv->vram_offset : dev_priv->agp_offset) +
-            ((item->mm_node.start) << VIA_MM_ALIGN_SHIFT);
-        mem->index = user_key;
-
-        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->index = 0;
-        DRM_DEBUG("Video memory allocation failed\n");
-
         return retval;
 }
 
@@ -188,57 +161,32 @@ int via_mem_free(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
         drm_via_private_t *dev_priv = dev->dev_private;
         drm_via_mem_t *mem = data;
-        struct via_memblock *obj;
+        int ret;
 
         mutex_lock(&dev->struct_mutex);
-        obj = idr_find(&dev_priv->object_idr, mem->index);
-        if (obj == NULL) {
-                mutex_unlock(&dev->struct_mutex);
-                return -EINVAL;
-        }
-
-        idr_remove(&dev_priv->object_idr, mem->index);
-        list_del(&obj->owner_list);
-        drm_mm_remove_node(&obj->mm_node);
-        kfree(obj);
+        ret = drm_sman_free_key(&dev_priv->sman, mem->index);
         mutex_unlock(&dev->struct_mutex);
-
         DRM_DEBUG("free = 0x%lx\n", mem->index);
 
-        return 0;
+        return ret;
 }
 
 
 void via_reclaim_buffers_locked(struct drm_device *dev,
-                                struct drm_file *file)
+                                struct drm_file *file_priv)
 {
-        struct via_file_private *file_priv = file->driver_priv;
-        struct via_memblock *entry, *next;
-
-        if (!(file->minor->master && file->master->lock.hw_lock))
-                return;
-
-        drm_idlelock_take(&file->master->lock);
+        drm_via_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;
         }
 
-        via_driver_dma_quiescent(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);
-                drm_mm_remove_node(&entry->mm_node);
-                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;
 }