git://git.onelab.eu / linux-2.6.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
vserver 2.0 rc7
[linux-2.6.git] / drivers / char / drm / i830_dma.c
diff --git a/drivers/char/drm/i830_dma.c b/drivers/char/drm/i830_dma.c
index 9afb677..98adccf 100644 (file)
--- a/drivers/char/drm/i830_dma.c
+++ b/drivers/char/drm/i830_dma.c
@@ -52,42 +52,6 @@
 #define up_write up
 #endif
 
-drm_ioctl_desc_t i830_ioctls[] = {
-       [DRM_IOCTL_NR(DRM_I830_INIT)]     = { i830_dma_init,    1, 1 },
-       [DRM_IOCTL_NR(DRM_I830_VERTEX)]   = { i830_dma_vertex,  1, 0 },
-       [DRM_IOCTL_NR(DRM_I830_CLEAR)]    = { i830_clear_bufs,  1, 0 },
-       [DRM_IOCTL_NR(DRM_I830_FLUSH)]    = { i830_flush_ioctl, 1, 0 },
-       [DRM_IOCTL_NR(DRM_I830_GETAGE)]   = { i830_getage,      1, 0 },
-       [DRM_IOCTL_NR(DRM_I830_GETBUF)]   = { i830_getbuf,      1, 0 },
-       [DRM_IOCTL_NR(DRM_I830_SWAP)]     = { i830_swap_bufs,   1, 0 },
-       [DRM_IOCTL_NR(DRM_I830_COPY)]     = { i830_copybuf,     1, 0 },
-       [DRM_IOCTL_NR(DRM_I830_DOCOPY)]   = { i830_docopy,      1, 0 },
-       [DRM_IOCTL_NR(DRM_I830_FLIP)]     = { i830_flip_bufs,   1, 0 },
-       [DRM_IOCTL_NR(DRM_I830_IRQ_EMIT)] = { i830_irq_emit,    1, 0 },
-       [DRM_IOCTL_NR(DRM_I830_IRQ_WAIT)] = { i830_irq_wait,    1, 0 },
-       [DRM_IOCTL_NR(DRM_I830_GETPARAM)] = { i830_getparam,    1, 0 },
-       [DRM_IOCTL_NR(DRM_I830_SETPARAM)] = { i830_setparam,    1, 0 } 
-};
-
-int i830_max_ioctl = DRM_ARRAY_SIZE(i830_ioctls);
-
-static inline void i830_print_status_page(drm_device_t *dev)
-{
-       drm_device_dma_t *dma = dev->dma;
-       drm_i830_private_t *dev_priv = dev->dev_private;
-       u32 *temp = dev_priv->hw_status_page;
-       int i;
-
-       DRM_DEBUG(  "hw_status: Interrupt Status : %x\n", temp[0]);
-       DRM_DEBUG(  "hw_status: LpRing Head ptr : %x\n", temp[1]);
-       DRM_DEBUG(  "hw_status: IRing Head ptr : %x\n", temp[2]);
-       DRM_DEBUG(  "hw_status: Reserved : %x\n", temp[3]);
-       DRM_DEBUG(  "hw_status: Driver Counter : %d\n", temp[5]);
-       for(i = 9; i < dma->buf_count + 9; i++) {
-               DRM_DEBUG( "buffer status idx : %d used: %d\n", i - 9, temp[i]);
-       }
-}
-
 static drm_buf_t *i830_freelist_get(drm_device_t *dev)
 {
        drm_device_dma_t *dma = dev->dma;
@@ -146,7 +110,7 @@ int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
        drm_i830_buf_priv_t *buf_priv;
 
        lock_kernel();
-       dev      = priv->dev;
+       dev      = priv->head->dev;
        dev_priv = dev->dev_private;
        buf      = dev_priv->mmap_buffer;
        buf_priv = buf->dev_private;
@@ -157,7 +121,7 @@ int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
        buf_priv->currently_mapped = I830_BUF_MAPPED;
        unlock_kernel();
 
-       if (remap_pfn_range(DRM_RPR_ARG(vma) vma->vm_start,
+       if (io_remap_pfn_range(vma, vma->vm_start,
                             VM_OFFSET(vma) >> PAGE_SHIFT,
                             vma->vm_end - vma->vm_start,
                             vma->vm_page_prot)) return -EAGAIN;
@@ -167,7 +131,7 @@ int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
 static int i830_map_buffer(drm_buf_t *buf, struct file *filp)
 {
        drm_file_t        *priv   = filp->private_data;
-       drm_device_t      *dev    = priv->dev;
+       drm_device_t      *dev    = priv->head->dev;
        drm_i830_buf_priv_t *buf_priv = buf->dev_private;
        drm_i830_private_t *dev_priv = dev->dev_private;
        struct file_operations *old_fops;
@@ -247,7 +211,7 @@ static int i830_dma_get_buffer(drm_device_t *dev, drm_i830_dma_t *d,
        return retcode;
 }
 
-int i830_dma_cleanup(drm_device_t *dev)
+static int i830_dma_cleanup(drm_device_t *dev)
 {
        drm_device_dma_t *dma = dev->dma;
 
@@ -479,11 +443,11 @@ static int i830_dma_initialize(drm_device_t *dev,
        return 0;
 }
 
-int i830_dma_init(struct inode *inode, struct file *filp,
+static int i830_dma_init(struct inode *inode, struct file *filp,
                  unsigned int cmd, unsigned long arg)
 {
        drm_file_t *priv = filp->private_data;
-       drm_device_t *dev = priv->dev;
+       drm_device_t *dev = priv->head->dev;
        drm_i830_private_t *dev_priv;
        drm_i830_init_t init;
        int retcode = 0;
@@ -1252,7 +1216,7 @@ static void i830_dma_dispatch_vertex(drm_device_t *dev,
 }
 
 
-void i830_dma_quiescent(drm_device_t *dev)
+static void i830_dma_quiescent(drm_device_t *dev)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
        RING_LOCALS;
@@ -1329,11 +1293,11 @@ void i830_reclaim_buffers(drm_device_t *dev, struct file *filp)
        }
 }
 
-int i830_flush_ioctl(struct inode *inode, struct file *filp, 
-                    unsigned int cmd, unsigned long arg)
+static int i830_flush_ioctl(struct inode *inode, struct file *filp, 
+                            unsigned int cmd, unsigned long arg)
 {
        drm_file_t        *priv   = filp->private_data;
-       drm_device_t      *dev    = priv->dev;
+       drm_device_t      *dev    = priv->head->dev;
 
        LOCK_TEST_WITH_RETURN(dev, filp);
 
@@ -1341,11 +1305,11 @@ int i830_flush_ioctl(struct inode *inode, struct file *filp,
        return 0;
 }
 
-int i830_dma_vertex(struct inode *inode, struct file *filp,
-              unsigned int cmd, unsigned long arg)
+static int i830_dma_vertex(struct inode *inode, struct file *filp,
+                      unsigned int cmd, unsigned long arg)
 {
        drm_file_t *priv = filp->private_data;
-       drm_device_t *dev = priv->dev;
+       drm_device_t *dev = priv->head->dev;
        drm_device_dma_t *dma = dev->dma;
        drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
        u32 *hw_status = dev_priv->hw_status_page;
@@ -1373,11 +1337,11 @@ int i830_dma_vertex(struct inode *inode, struct file *filp,
        return 0;
 }
 
-int i830_clear_bufs(struct inode *inode, struct file *filp,
-                  unsigned int cmd, unsigned long arg)
+static int i830_clear_bufs(struct inode *inode, struct file *filp,
+                          unsigned int cmd, unsigned long arg)
 {
        drm_file_t *priv = filp->private_data;
-       drm_device_t *dev = priv->dev;
+       drm_device_t *dev = priv->head->dev;
        drm_i830_clear_t clear;
 
        if (copy_from_user(&clear, (drm_i830_clear_t __user *)arg, sizeof(clear)))
@@ -1397,11 +1361,11 @@ int i830_clear_bufs(struct inode *inode, struct file *filp,
        return 0;
 }
 
-int i830_swap_bufs(struct inode *inode, struct file *filp,
-                 unsigned int cmd, unsigned long arg)
+static int i830_swap_bufs(struct inode *inode, struct file *filp,
+                         unsigned int cmd, unsigned long arg)
 {
        drm_file_t *priv = filp->private_data;
-       drm_device_t *dev = priv->dev;
+       drm_device_t *dev = priv->head->dev;
    
        DRM_DEBUG("i830_swap_bufs\n");
 
@@ -1425,7 +1389,7 @@ static void i830_do_init_pageflip( drm_device_t *dev )
        dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
 }
 
-int i830_do_cleanup_pageflip( drm_device_t *dev )
+static int i830_do_cleanup_pageflip( drm_device_t *dev )
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
 
@@ -1437,11 +1401,11 @@ int i830_do_cleanup_pageflip( drm_device_t *dev )
        return 0;
 }
 
-int i830_flip_bufs(struct inode *inode, struct file *filp,
-                  unsigned int cmd, unsigned long arg)
+static int i830_flip_bufs(struct inode *inode, struct file *filp,
+                          unsigned int cmd, unsigned long arg)
 {
        drm_file_t *priv = filp->private_data;
-       drm_device_t *dev = priv->dev;
+       drm_device_t *dev = priv->head->dev;
        drm_i830_private_t *dev_priv = dev->dev_private;
 
        DRM_DEBUG("%s\n", __FUNCTION__);
@@ -1455,11 +1419,11 @@ int i830_flip_bufs(struct inode *inode, struct file *filp,
        return 0;
 }
 
-int i830_getage(struct inode *inode, struct file *filp, unsigned int cmd,
-               unsigned long arg)
+static int i830_getage(struct inode *inode, struct file *filp, unsigned int cmd,
+                       unsigned long arg)
 {
        drm_file_t        *priv     = filp->private_data;
-       drm_device_t      *dev      = priv->dev;
+       drm_device_t      *dev      = priv->head->dev;
        drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
        u32 *hw_status = dev_priv->hw_status_page;
        drm_i830_sarea_t *sarea_priv = (drm_i830_sarea_t *) 
@@ -1469,11 +1433,11 @@ int i830_getage(struct inode *inode, struct file *filp, unsigned int cmd,
        return 0;
 }
 
-int i830_getbuf(struct inode *inode, struct file *filp, unsigned int cmd,
-               unsigned long arg)
+static int i830_getbuf(struct inode *inode, struct file *filp, unsigned int cmd,
+                       unsigned long arg)
 {
        drm_file_t        *priv     = filp->private_data;
-       drm_device_t      *dev      = priv->dev;
+       drm_device_t      *dev      = priv->head->dev;
        int               retcode   = 0;
        drm_i830_dma_t    d;
        drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
@@ -1501,28 +1465,26 @@ int i830_getbuf(struct inode *inode, struct file *filp, unsigned int cmd,
        return retcode;
 }
 
-int i830_copybuf(struct inode *inode,
-                struct file *filp, 
-                unsigned int cmd,
-                unsigned long arg)
+static int i830_copybuf(struct inode *inode,
+                        struct file *filp, unsigned int cmd, unsigned long arg)
 {
        /* Never copy - 2.4.x doesn't need it */
        return 0;
 }
 
-int i830_docopy(struct inode *inode, struct file *filp, unsigned int cmd,
-               unsigned long arg)
+static int i830_docopy(struct inode *inode, struct file *filp, unsigned int cmd,
+                       unsigned long arg)
 {
        return 0;
 }
 
 
 
-int i830_getparam( struct inode *inode, struct file *filp, unsigned int cmd,
-                     unsigned long arg )
+static int i830_getparam( struct inode *inode, struct file *filp, 
+                       unsigned int cmd, unsigned long arg )
 {
        drm_file_t        *priv     = filp->private_data;
-       drm_device_t      *dev      = priv->dev;
+       drm_device_t      *dev      = priv->head->dev;
        drm_i830_private_t *dev_priv = dev->dev_private;
        drm_i830_getparam_t param;
        int value;
@@ -1552,11 +1514,11 @@ int i830_getparam( struct inode *inode, struct file *filp, unsigned int cmd,
 }
 
 
-int i830_setparam( struct inode *inode, struct file *filp, unsigned int cmd,
-                  unsigned long arg )
+static int i830_setparam( struct inode *inode, struct file *filp,
+                       unsigned int cmd, unsigned long arg )
 {
        drm_file_t        *priv     = filp->private_data;
-       drm_device_t      *dev      = priv->dev;
+       drm_device_t      *dev      = priv->head->dev;
        drm_i830_private_t *dev_priv = dev->dev_private;
        drm_i830_setparam_t param;
 
@@ -1585,6 +1547,16 @@ void i830_driver_pretakedown(drm_device_t *dev)
        i830_dma_cleanup( dev );
 }
 
+void i830_driver_prerelease(drm_device_t *dev, DRMFILE filp)
+{
+       if (dev->dev_private) {
+               drm_i830_private_t *dev_priv = dev->dev_private;
+               if (dev_priv->page_flipping) {
+                       i830_do_cleanup_pageflip(dev);
+               }
+       }
+}
+
 void i830_driver_release(drm_device_t *dev, struct file *filp)
 {
        i830_reclaim_buffers(dev, filp);
@@ -1596,3 +1568,21 @@ int i830_driver_dma_quiescent(drm_device_t *dev)
        return 0;
 }
 
+drm_ioctl_desc_t i830_ioctls[] = {
+       [DRM_IOCTL_NR(DRM_I830_INIT)]     = { i830_dma_init,    1, 1 },
+       [DRM_IOCTL_NR(DRM_I830_VERTEX)]   = { i830_dma_vertex,  1, 0 },
+       [DRM_IOCTL_NR(DRM_I830_CLEAR)]    = { i830_clear_bufs,  1, 0 },
+       [DRM_IOCTL_NR(DRM_I830_FLUSH)]    = { i830_flush_ioctl, 1, 0 },
+       [DRM_IOCTL_NR(DRM_I830_GETAGE)]   = { i830_getage,      1, 0 },
+       [DRM_IOCTL_NR(DRM_I830_GETBUF)]   = { i830_getbuf,      1, 0 },
+       [DRM_IOCTL_NR(DRM_I830_SWAP)]     = { i830_swap_bufs,   1, 0 },
+       [DRM_IOCTL_NR(DRM_I830_COPY)]     = { i830_copybuf,     1, 0 },
+       [DRM_IOCTL_NR(DRM_I830_DOCOPY)]   = { i830_docopy,      1, 0 },
+       [DRM_IOCTL_NR(DRM_I830_FLIP)]     = { i830_flip_bufs,   1, 0 },
+       [DRM_IOCTL_NR(DRM_I830_IRQ_EMIT)] = { i830_irq_emit,    1, 0 },
+       [DRM_IOCTL_NR(DRM_I830_IRQ_WAIT)] = { i830_irq_wait,    1, 0 },
+       [DRM_IOCTL_NR(DRM_I830_GETPARAM)] = { i830_getparam,    1, 0 },
+       [DRM_IOCTL_NR(DRM_I830_SETPARAM)] = { i830_setparam,    1, 0 } 
+};
+
+int i830_max_ioctl = DRM_ARRAY_SIZE(i830_ioctls);
linux-2.6