Patched in Tegra support.

9 files changed, 91 insertions, 169 deletions

diff --git a/drivers/gpu/drm/via/via_dma.c b/drivers/gpu/drm/via/via_dma.c
index 13558f5a242..cc0ffa9abd0 100644
--- a/drivers/gpu/drm/via/via_dma.c
+++ b/drivers/gpu/drm/via/via_dma.c
@@ -34,8 +34,9 @@
  *    Thomas Hellstrom.
  */
 
-#include <drm/drmP.h>
-#include <drm/via_drm.h>
+#include "drmP.h"
+#include "drm.h"
+#include "via_drm.h"
 #include "via_drv.h"
 #include "via_3d_reg.h"
 
diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c
index 8b0f25904e6..3e038a394c5 100644
--- a/drivers/gpu/drm/via/via_dmablit.c
+++ b/drivers/gpu/drm/via/via_dmablit.c
@@ -34,8 +34,8 @@
  * the same DMA mappings?
  */
 
-#include <drm/drmP.h>
-#include <drm/via_drm.h>
+#include "drmP.h"
+#include "via_drm.h"
 #include "via_drv.h"
 #include "via_dmablit.h"
 
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index f4ae2032794..920a55214bc 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -22,64 +22,22 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <linux/module.h>
-
-#include <drm/drmP.h>
-#include <drm/via_drm.h>
+#include "drmP.h"
+#include "via_drm.h"
 #include "via_drv.h"
 
-#include <drm/drm_pciids.h>
-
-static int via_driver_open(struct drm_device *dev, struct drm_file *file)
-{
-        struct via_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 via_driver_postclose(struct drm_device *dev, struct drm_file *file)
-{
-        struct via_file_private *file_priv = file->driver_priv;
-
-        kfree(file_priv);
-}
+#include "drm_pciids.h"
 
 static struct pci_device_id pciidlist[] = {
         viadrv_PCI_IDS
 };
 
-static const struct file_operations via_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 struct drm_driver driver = {
         .driver_features =
             DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_HAVE_IRQ |
             DRIVER_IRQ_SHARED,
         .load = via_driver_load,
         .unload = via_driver_unload,
-        .open = via_driver_open,
-        .preclose = via_reclaim_buffers_locked,
-        .postclose = via_driver_postclose,
         .context_dtor = via_final_context,
         .get_vblank_counter = via_get_vblank_counter,
         .enable_vblank = via_enable_vblank,
@@ -89,9 +47,22 @@ static struct drm_driver driver = {
         .irq_uninstall = via_driver_irq_uninstall,
         .irq_handler = via_driver_irq_handler,
         .dma_quiescent = via_driver_dma_quiescent,
+        .reclaim_buffers = drm_core_reclaim_buffers,
+        .reclaim_buffers_locked = NULL,
+        .reclaim_buffers_idlelocked = via_reclaim_buffers_locked,
         .lastclose = via_lastclose,
         .ioctls = via_ioctls,
-        .fops = &via_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/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 893a65090c3..9cf87d91232 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -24,7 +24,7 @@
 #ifndef _VIA_DRV_H_
 #define _VIA_DRV_H_
 
-#include <drm/drm_mm.h>
+#include "drm_sman.h"
 #define DRIVER_AUTHOR   "Various"
 
 #define DRIVER_NAME             "via"
@@ -88,12 +88,9 @@ typedef struct drm_via_private {
         uint32_t irq_pending_mask;
         int *irq_map;
         unsigned int idle_fault;
+        struct drm_sman sman;
         int vram_initialized;
-        struct drm_mm vram_mm;
         int agp_initialized;
-        struct drm_mm agp_mm;
-        /** Mapping of userspace keys to mm objects */
-        struct idr object_idr;
         unsigned long vram_offset;
         unsigned long agp_offset;
         drm_via_blitq_t blit_queues[VIA_NUM_BLIT_ENGINES];
diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
index ac98964297c..d391f48ef87 100644
--- a/drivers/gpu/drm/via/via_irq.c
+++ b/drivers/gpu/drm/via/via_irq.c
@@ -35,8 +35,9 @@
  * The refresh rate is also calculated for video playback sync purposes.
  */
 
-#include <drm/drmP.h>
-#include <drm/via_drm.h>
+#include "drmP.h"
+#include "drm.h"
+#include "via_drm.h"
 #include "via_drv.h"
 
 #define VIA_REG_INTERRUPT       0x200
diff --git a/drivers/gpu/drm/via/via_map.c b/drivers/gpu/drm/via/via_map.c
index c0f1cc7f5ca..6cca9a709f7 100644
--- a/drivers/gpu/drm/via/via_map.c
+++ b/drivers/gpu/drm/via/via_map.c
@@ -21,8 +21,8 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include <drm/drmP.h>
-#include <drm/via_drm.h>
+#include "drmP.h"
+#include "via_drm.h"
 #include "via_drv.h"
 
 static int via_do_init_map(struct drm_device *dev, drm_via_init_t *init)
@@ -100,15 +100,19 @@ int via_driver_load(struct drm_device *dev, unsigned long chipset)
         if (dev_priv == NULL)
                 return -ENOMEM;
 
-        idr_init(&dev_priv->object_idr);
         dev->dev_private = (void *)dev_priv;
 
         dev_priv->chipset = chipset;
 
-        pci_set_master(dev->pdev);
+        ret = drm_sman_init(&dev_priv->sman, 2, 12, 8);
+        if (ret) {
+                kfree(dev_priv);
+                return ret;
+        }
 
         ret = drm_vblank_init(dev, 1);
         if (ret) {
+                drm_sman_takedown(&dev_priv->sman);
                 kfree(dev_priv);
                 return ret;
         }
@@ -120,8 +124,7 @@ int via_driver_unload(struct drm_device *dev)
 {
         drm_via_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);
 
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;
 }
diff --git a/drivers/gpu/drm/via/via_verifier.c b/drivers/gpu/drm/via/via_verifier.c
index 9dbc92bd151..48957b856d4 100644
--- a/drivers/gpu/drm/via/via_verifier.c
+++ b/drivers/gpu/drm/via/via_verifier.c
@@ -29,8 +29,9 @@
  */
 
 #include "via_3d_reg.h"
-#include <drm/drmP.h>
-#include <drm/via_drm.h>
+#include "drmP.h"
+#include "drm.h"
+#include "via_drm.h"
 #include "via_verifier.h"
 #include "via_drv.h"
 
diff --git a/drivers/gpu/drm/via/via_video.c b/drivers/gpu/drm/via/via_video.c
index 6569efa2ff6..675d311f038 100644
--- a/drivers/gpu/drm/via/via_video.c
+++ b/drivers/gpu/drm/via/via_video.c
@@ -25,8 +25,8 @@
  * Video and XvMC related functions.
  */
 
-#include <drm/drmP.h>
-#include <drm/via_drm.h>
+#include "drmP.h"
+#include "via_drm.h"
 #include "via_drv.h"
 
 void via_init_futex(drm_via_private_t *dev_priv)