Patched in Tegra support.

3 files changed, 40 insertions, 44 deletions

diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
index 004ecdfe1b5..8f371e8d630 100644
--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
@@ -30,8 +30,9 @@
  *
  */
 
-#include <drm/drmP.h>
-#include <drm/i810_drm.h>
+#include "drmP.h"
+#include "drm.h"
+#include "i810_drm.h"
 #include "i810_drv.h"
 #include <linux/interrupt.h>    /* For task queue support */
 #include <linux/delay.h>
@@ -98,6 +99,7 @@ static int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
         buf_priv = buf->dev_private;
 
         vma->vm_flags |= (VM_IO | VM_DONTCOPY);
+        vma->vm_file = filp;
 
         buf_priv->currently_mapped = I810_BUF_MAPPED;
 
@@ -114,9 +116,6 @@ static const struct file_operations i810_buffer_fops = {
         .unlocked_ioctl = drm_ioctl,
         .mmap = i810_mmap_buffers,
         .fasync = drm_fasync,
-#ifdef CONFIG_COMPAT
-        .compat_ioctl = drm_compat_ioctl,
-#endif
         .llseek = noop_llseek,
 };
 
@@ -131,11 +130,11 @@ static int i810_map_buffer(struct drm_buf *buf, struct drm_file *file_priv)
         if (buf_priv->currently_mapped == I810_BUF_MAPPED)
                 return -EINVAL;
 
-        /* This is all entirely broken */
+        down_write(&current->mm->mmap_sem);
         old_fops = file_priv->filp->f_op;
         file_priv->filp->f_op = &i810_buffer_fops;
         dev_priv->mmap_buffer = buf;
-        buf_priv->virtual = (void *)vm_mmap(file_priv->filp, 0, buf->total,
+        buf_priv->virtual = (void *)do_mmap(file_priv->filp, 0, buf->total,
                                             PROT_READ | PROT_WRITE,
                                             MAP_SHARED, buf->bus_address);
         dev_priv->mmap_buffer = NULL;
@@ -146,6 +145,7 @@ static int i810_map_buffer(struct drm_buf *buf, struct drm_file *file_priv)
                 retcode = PTR_ERR(buf_priv->virtual);
                 buf_priv->virtual = NULL;
         }
+        up_write(&current->mm->mmap_sem);
 
         return retcode;
 }
@@ -158,8 +158,11 @@ static int i810_unmap_buffer(struct drm_buf *buf)
         if (buf_priv->currently_mapped != I810_BUF_MAPPED)
                 return -EINVAL;
 
-        retcode = vm_munmap((unsigned long)buf_priv->virtual,
+        down_write(&current->mm->mmap_sem);
+        retcode = do_munmap(current->mm,
+                            (unsigned long)buf_priv->virtual,
                             (size_t) buf->total);
+        up_write(&current->mm->mmap_sem);
 
         buf_priv->currently_mapped = I810_BUF_UNMAPPED;
         buf_priv->virtual = NULL;
@@ -219,6 +222,8 @@ static int i810_dma_cleanup(struct drm_device *dev)
                         pci_free_consistent(dev->pdev, PAGE_SIZE,
                                             dev_priv->hw_status_page,
                                             dev_priv->dma_status_page);
+                        /* Need to rewrite hardware status page */
+                        I810_WRITE(0x02080, 0x1ffff000);
                 }
                 kfree(dev->dev_private);
                 dev->dev_private = NULL;
@@ -883,7 +888,7 @@ static int i810_flush_queue(struct drm_device *dev)
 }
 
 /* Must be called with the lock held */
-void i810_driver_reclaim_buffers(struct drm_device *dev,
+static void i810_reclaim_buffers(struct drm_device *dev,
                                  struct drm_file *file_priv)
 {
         struct drm_device_dma *dma = dev->dma;
@@ -1205,8 +1210,6 @@ int i810_driver_load(struct drm_device *dev, unsigned long flags)
         dev->types[8] = _DRM_STAT_SECONDARY;
         dev->types[9] = _DRM_STAT_DMA;
 
-        pci_set_master(dev->pdev);
-
         return 0;
 }
 
@@ -1222,17 +1225,12 @@ void i810_driver_preclose(struct drm_device *dev, struct drm_file *file_priv)
                 if (dev_priv->page_flipping)
                         i810_do_cleanup_pageflip(dev);
         }
+}
 
-        if (file_priv->master && file_priv->master->lock.hw_lock) {
-                drm_idlelock_take(&file_priv->master->lock);
-                i810_driver_reclaim_buffers(dev, file_priv);
-                drm_idlelock_release(&file_priv->master->lock);
-        } else {
-                /* master disappeared, clean up stuff anyway and hope nothing
-                 * goes wrong */
-                i810_driver_reclaim_buffers(dev, file_priv);
-        }
-
+void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
+                                        struct drm_file *file_priv)
+{
+        i810_reclaim_buffers(dev, file_priv);
 }
 
 int i810_driver_dma_quiescent(struct drm_device *dev)
diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c
index 2e91fc3580b..6f98d059f68 100644
--- a/drivers/gpu/drm/i810/i810_drv.c
+++ b/drivers/gpu/drm/i810/i810_drv.c
@@ -30,44 +30,40 @@
  *    Gareth Hughes <gareth@valinux.com>
  */
 
-#include <linux/module.h>
-
-#include <drm/drmP.h>
-#include <drm/i810_drm.h>
+#include "drmP.h"
+#include "drm.h"
+#include "i810_drm.h"
 #include "i810_drv.h"
 
-#include <drm/drm_pciids.h>
+#include "drm_pciids.h"
 
 static struct pci_device_id pciidlist[] = {
         i810_PCI_IDS
 };
 
-static const struct file_operations i810_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_REQUIRE_AGP | DRIVER_USE_MTRR |
-            DRIVER_HAVE_DMA,
+            DRIVER_HAVE_DMA | DRIVER_DMA_QUEUE,
         .dev_priv_size = sizeof(drm_i810_buf_priv_t),
         .load = i810_driver_load,
         .lastclose = i810_driver_lastclose,
         .preclose = i810_driver_preclose,
         .device_is_agp = i810_driver_device_is_agp,
+        .reclaim_buffers_locked = i810_driver_reclaim_buffers_locked,
         .dma_quiescent = i810_driver_dma_quiescent,
         .ioctls = i810_ioctls,
-        .fops = &i810_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/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
index 6e0acad9e0f..c9339f48179 100644
--- a/drivers/gpu/drm/i810/i810_drv.h
+++ b/drivers/gpu/drm/i810/i810_drv.h
@@ -116,12 +116,14 @@ typedef struct drm_i810_private {
 
                                 /* i810_dma.c */
 extern int i810_driver_dma_quiescent(struct drm_device *dev);
-void i810_driver_reclaim_buffers(struct drm_device *dev,
-                                 struct drm_file *file_priv);
+extern void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
+                                               struct drm_file *file_priv);
 extern int i810_driver_load(struct drm_device *, unsigned long flags);
 extern void i810_driver_lastclose(struct drm_device *dev);
 extern void i810_driver_preclose(struct drm_device *dev,
                                  struct drm_file *file_priv);
+extern void i810_driver_reclaim_buffers_locked(struct drm_device *dev,
+                                               struct drm_file *file_priv);
 extern int i810_driver_device_is_agp(struct drm_device *dev);
 
 extern long i810_ioctl(struct file *file, unsigned int cmd, unsigned long arg);