drm: drop drm_buf_t typedef

Signed-off-by: Dave Airlie <airlied@linux.ie>

diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 63ee053..83d7d14 100644 (file)
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -294,7 +294,7 @@ typedef struct drm_vma_entry {
 /**
  * DMA buffer.
  */
-typedef struct drm_buf {
+struct drm_buf {
        int idx;                       /**< Index into master buflist */
        int total;                     /**< Buffer size */
        int order;                     /**< log-base-2(total) */
@@ -320,15 +320,15 @@ typedef struct drm_buf {
 
        int dev_priv_size;               /**< Size of buffer private storage */
        void *dev_private;               /**< Per-buffer private storage */
-} drm_buf_t;
+};
 
 /** bufs is one longer than it has to be */
 typedef struct drm_waitlist {
        int count;                      /**< Number of possible buffers */
-       drm_buf_t **bufs;               /**< List of pointers to buffers */
-       drm_buf_t **rp;                 /**< Read pointer */
-       drm_buf_t **wp;                 /**< Write pointer */
-       drm_buf_t **end;                /**< End pointer */
+       struct drm_buf **bufs;          /**< List of pointers to buffers */
+       struct drm_buf **rp;                    /**< Read pointer */
+       struct drm_buf **wp;                    /**< Write pointer */
+       struct drm_buf **end;           /**< End pointer */
        spinlock_t read_lock;
        spinlock_t write_lock;
 } drm_waitlist_t;
@@ -336,7 +336,7 @@ typedef struct drm_waitlist {
 typedef struct drm_freelist {
        int initialized;               /**< Freelist in use */
        atomic_t count;                /**< Number of free buffers */
-       drm_buf_t *next;               /**< End pointer */
+       struct drm_buf *next;          /**< End pointer */
 
        wait_queue_head_t waiting;     /**< Processes waiting on free bufs */
        int low_mark;                  /**< Low water mark */
@@ -357,7 +357,7 @@ typedef struct drm_dma_handle {
 typedef struct drm_buf_entry {
        int buf_size;                   /**< size */
        int buf_count;                  /**< number of buffers */
-       drm_buf_t *buflist;             /**< buffer list */
+       struct drm_buf *buflist;                /**< buffer list */
        int seg_count;
        int page_order;
        drm_dma_handle_t **seglist;
@@ -421,7 +421,7 @@ typedef struct drm_device_dma {
 
        drm_buf_entry_t bufs[DRM_MAX_ORDER + 1];        /**< buffers, grouped by their size order */
        int buf_count;                  /**< total number of buffers */
-       drm_buf_t **buflist;            /**< Vector of pointers into drm_device_dma::bufs */
+       struct drm_buf **buflist;               /**< Vector of pointers into drm_device_dma::bufs */
        int seg_count;
        int page_count;                 /**< number of pages */
        unsigned long *pagelist;        /**< page list */
@@ -964,7 +964,7 @@ extern unsigned long drm_get_resource_len(struct drm_device *dev,
                                /* DMA support (drm_dma.h) */
 extern int drm_dma_setup(struct drm_device *dev);
 extern void drm_dma_takedown(struct drm_device *dev);
-extern void drm_free_buffer(struct drm_device *dev, drm_buf_t * buf);
+extern void drm_free_buffer(struct drm_device *dev, struct drm_buf * buf);
 extern void drm_core_reclaim_buffers(struct drm_device *dev, struct file *filp);
 
                                /* IRQ support (drm_irq.h) */

diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c
index d12e287..bdd3015 100644 (file)
--- a/drivers/char/drm/drm_bufs.c
+++ b/drivers/char/drm/drm_bufs.c
@@ -554,7 +554,7 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request)
        drm_device_dma_t *dma = dev->dma;
        drm_buf_entry_t *entry;
        drm_agp_mem_t *agp_entry;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        unsigned long offset;
        unsigned long agp_offset;
        int count;
@@ -565,7 +565,7 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request)
        int total;
        int byte_count;
        int i, valid;
-       drm_buf_t **temp_buflist;
+       struct drm_buf **temp_buflist;
 
        if (!dma)
                return -EINVAL;
@@ -729,14 +729,14 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request)
        int page_order;
        drm_buf_entry_t *entry;
        drm_dma_handle_t *dmah;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        int alignment;
        unsigned long offset;
        int i;
        int byte_count;
        int page_count;
        unsigned long *temp_pagelist;
-       drm_buf_t **temp_buflist;
+       struct drm_buf **temp_buflist;
 
        if (!drm_core_check_feature(dev, DRIVER_PCI_DMA))
                return -EINVAL;
@@ -949,7 +949,7 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request
 {
        drm_device_dma_t *dma = dev->dma;
        drm_buf_entry_t *entry;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        unsigned long offset;
        unsigned long agp_offset;
        int count;
@@ -960,7 +960,7 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request
        int total;
        int byte_count;
        int i;
-       drm_buf_t **temp_buflist;
+       struct drm_buf **temp_buflist;
 
        if (!drm_core_check_feature(dev, DRIVER_SG))
                return -EINVAL;
@@ -1111,7 +1111,7 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request
 {
        drm_device_dma_t *dma = dev->dma;
        drm_buf_entry_t *entry;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        unsigned long offset;
        unsigned long agp_offset;
        int count;
@@ -1122,7 +1122,7 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request
        int total;
        int byte_count;
        int i;
-       drm_buf_t **temp_buflist;
+       struct drm_buf **temp_buflist;
 
        if (!drm_core_check_feature(dev, DRIVER_FB_DMA))
                return -EINVAL;
@@ -1481,7 +1481,7 @@ int drm_freebufs(struct inode *inode, struct file *filp,
        struct drm_buf_free request;
        int i;
        int idx;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
 
        if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA))
                return -EINVAL;

diff --git a/drivers/char/drm/drm_dma.c b/drivers/char/drm/drm_dma.c
index 2cffb7b..739a6a7 100644 (file)
--- a/drivers/char/drm/drm_dma.c
+++ b/drivers/char/drm/drm_dma.c
@@ -129,7 +129,7 @@ void drm_dma_takedown(struct drm_device *dev)
  *
  * Resets the fields of \p buf.
  */
-void drm_free_buffer(struct drm_device *dev, drm_buf_t * buf)
+void drm_free_buffer(struct drm_device *dev, struct drm_buf * buf)
 {
        if (!buf)
                return;

diff --git a/drivers/char/drm/i810_dma.c b/drivers/char/drm/i810_dma.c
index ca82cdd..b4a98fa 100644 (file)
--- a/drivers/char/drm/i810_dma.c
+++ b/drivers/char/drm/i810_dma.c
@@ -45,7 +45,7 @@
 #define I810_BUF_UNMAPPED 0
 #define I810_BUF_MAPPED   1
 
-static drm_buf_t *i810_freelist_get(struct drm_device * dev)
+static struct drm_buf *i810_freelist_get(struct drm_device * dev)
 {
        drm_device_dma_t *dma = dev->dma;
        int i;
@@ -54,7 +54,7 @@ static drm_buf_t *i810_freelist_get(struct drm_device * dev)
        /* Linear search might not be the best solution */
 
        for (i = 0; i < dma->buf_count; i++) {
-               drm_buf_t *buf = dma->buflist[i];
+               struct drm_buf *buf = dma->buflist[i];
                drm_i810_buf_priv_t *buf_priv = buf->dev_private;
                /* In use is already a pointer */
                used = cmpxchg(buf_priv->in_use, I810_BUF_FREE,
@@ -70,7 +70,7 @@ static drm_buf_t *i810_freelist_get(struct drm_device * dev)
  * yet, the hardware updates in use for us once its on the ring buffer.
  */
 
-static int i810_freelist_put(struct drm_device * dev, drm_buf_t * buf)
+static int i810_freelist_put(struct drm_device * dev, struct drm_buf * buf)
 {
        drm_i810_buf_priv_t *buf_priv = buf->dev_private;
        int used;
@@ -90,7 +90,7 @@ static int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
        struct drm_file *priv = filp->private_data;
        struct drm_device *dev;
        drm_i810_private_t *dev_priv;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        drm_i810_buf_priv_t *buf_priv;
 
        lock_kernel();
@@ -120,7 +120,7 @@ static const struct file_operations i810_buffer_fops = {
        .fasync = drm_fasync,
 };
 
-static int i810_map_buffer(drm_buf_t * buf, struct file *filp)
+static int i810_map_buffer(struct drm_buf * buf, struct file *filp)
 {
        struct drm_file *priv = filp->private_data;
        struct drm_device *dev = priv->head->dev;
@@ -152,7 +152,7 @@ static int i810_map_buffer(drm_buf_t * buf, struct file *filp)
        return retcode;
 }
 
-static int i810_unmap_buffer(drm_buf_t * buf)
+static int i810_unmap_buffer(struct drm_buf * buf)
 {
        drm_i810_buf_priv_t *buf_priv = buf->dev_private;
        int retcode = 0;
@@ -175,7 +175,7 @@ static int i810_unmap_buffer(drm_buf_t * buf)
 static int i810_dma_get_buffer(struct drm_device * dev, drm_i810_dma_t * d,
                               struct file *filp)
 {
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        drm_i810_buf_priv_t *buf_priv;
        int retcode = 0;
 
@@ -233,7 +233,7 @@ static int i810_dma_cleanup(struct drm_device * dev)
                dev->dev_private = NULL;
 
                for (i = 0; i < dma->buf_count; i++) {
-                       drm_buf_t *buf = dma->buflist[i];
+                       struct drm_buf *buf = dma->buflist[i];
                        drm_i810_buf_priv_t *buf_priv = buf->dev_private;
 
                        if (buf_priv->kernel_virtual && buf->total)
@@ -301,7 +301,7 @@ static int i810_freelist_init(struct drm_device * dev, drm_i810_private_t * dev_
        }
 
        for (i = 0; i < dma->buf_count; i++) {
-               drm_buf_t *buf = dma->buflist[i];
+               struct drm_buf *buf = dma->buflist[i];
                drm_i810_buf_priv_t *buf_priv = buf->dev_private;
 
                buf_priv->in_use = hw_status++;
@@ -788,7 +788,7 @@ static void i810_dma_dispatch_swap(struct drm_device * dev)
 }
 
 static void i810_dma_dispatch_vertex(struct drm_device * dev,
-                                    drm_buf_t * buf, int discard, int used)
+                                    struct drm_buf * buf, int discard, int used)
 {
        drm_i810_private_t *dev_priv = dev->dev_private;
        drm_i810_buf_priv_t *buf_priv = buf->dev_private;
@@ -952,7 +952,7 @@ static int i810_flush_queue(struct drm_device * dev)
        i810_wait_ring(dev, dev_priv->ring.Size - 8);
 
        for (i = 0; i < dma->buf_count; i++) {
-               drm_buf_t *buf = dma->buflist[i];
+               struct drm_buf *buf = dma->buflist[i];
                drm_i810_buf_priv_t *buf_priv = buf->dev_private;
 
                int used = cmpxchg(buf_priv->in_use, I810_BUF_HARDWARE,
@@ -983,7 +983,7 @@ static void i810_reclaim_buffers(struct drm_device * dev, struct file *filp)
        i810_flush_queue(dev);
 
        for (i = 0; i < dma->buf_count; i++) {
-               drm_buf_t *buf = dma->buflist[i];
+               struct drm_buf *buf = dma->buflist[i];
                drm_i810_buf_priv_t *buf_priv = buf->dev_private;
 
                if (buf->filp == filp && buf_priv) {
@@ -1142,7 +1142,7 @@ static int i810_docopy(struct inode *inode, struct file *filp, unsigned int cmd,
        return 0;
 }
 
-static void i810_dma_dispatch_mc(struct drm_device * dev, drm_buf_t * buf, int used,
+static void i810_dma_dispatch_mc(struct drm_device * dev, struct drm_buf * buf, int used,
                                 unsigned int last_render)
 {
        drm_i810_private_t *dev_priv = dev->dev_private;

diff --git a/drivers/char/drm/i810_drv.h b/drivers/char/drm/i810_drv.h
index 591a23d..6488338 100644 (file)
--- a/drivers/char/drm/i810_drv.h
+++ b/drivers/char/drm/i810_drv.h
@@ -88,7 +88,7 @@ typedef struct drm_i810_private {
 
        dma_addr_t dma_status_page;
 
-       drm_buf_t *mmap_buffer;
+       struct drm_buf *mmap_buffer;
 
        u32 front_di1, back_di1, zi1;
 

diff --git a/drivers/char/drm/i830_dma.c b/drivers/char/drm/i830_dma.c
index 57ce074..021a071 100644 (file)
--- a/drivers/char/drm/i830_dma.c
+++ b/drivers/char/drm/i830_dma.c
@@ -47,7 +47,7 @@
 #define I830_BUF_UNMAPPED 0
 #define I830_BUF_MAPPED   1
 
-static drm_buf_t *i830_freelist_get(struct drm_device * dev)
+static struct drm_buf *i830_freelist_get(struct drm_device * dev)
 {
        drm_device_dma_t *dma = dev->dma;
        int i;
@@ -56,7 +56,7 @@ static drm_buf_t *i830_freelist_get(struct drm_device * dev)
        /* Linear search might not be the best solution */
 
        for (i = 0; i < dma->buf_count; i++) {
-               drm_buf_t *buf = dma->buflist[i];
+               struct drm_buf *buf = dma->buflist[i];
                drm_i830_buf_priv_t *buf_priv = buf->dev_private;
                /* In use is already a pointer */
                used = cmpxchg(buf_priv->in_use, I830_BUF_FREE,
@@ -72,7 +72,7 @@ static drm_buf_t *i830_freelist_get(struct drm_device * dev)
  * yet, the hardware updates in use for us once its on the ring buffer.
  */
 
-static int i830_freelist_put(struct drm_device * dev, drm_buf_t * buf)
+static int i830_freelist_put(struct drm_device * dev, struct drm_buf * buf)
 {
        drm_i830_buf_priv_t *buf_priv = buf->dev_private;
        int used;
@@ -92,7 +92,7 @@ static int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
        struct drm_file *priv = filp->private_data;
        struct drm_device *dev;
        drm_i830_private_t *dev_priv;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        drm_i830_buf_priv_t *buf_priv;
 
        lock_kernel();
@@ -122,7 +122,7 @@ static const struct file_operations i830_buffer_fops = {
        .fasync = drm_fasync,
 };
 
-static int i830_map_buffer(drm_buf_t * buf, struct file *filp)
+static int i830_map_buffer(struct drm_buf * buf, struct file *filp)
 {
        struct drm_file *priv = filp->private_data;
        struct drm_device *dev = priv->head->dev;
@@ -156,7 +156,7 @@ static int i830_map_buffer(drm_buf_t * buf, struct file *filp)
        return retcode;
 }
 
-static int i830_unmap_buffer(drm_buf_t * buf)
+static int i830_unmap_buffer(struct drm_buf * buf)
 {
        drm_i830_buf_priv_t *buf_priv = buf->dev_private;
        int retcode = 0;
@@ -179,7 +179,7 @@ static int i830_unmap_buffer(drm_buf_t * buf)
 static int i830_dma_get_buffer(struct drm_device * dev, drm_i830_dma_t * d,
                               struct file *filp)
 {
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        drm_i830_buf_priv_t *buf_priv;
        int retcode = 0;
 
@@ -238,7 +238,7 @@ static int i830_dma_cleanup(struct drm_device * dev)
                dev->dev_private = NULL;
 
                for (i = 0; i < dma->buf_count; i++) {
-                       drm_buf_t *buf = dma->buflist[i];
+                       struct drm_buf *buf = dma->buflist[i];
                        drm_i830_buf_priv_t *buf_priv = buf->dev_private;
                        if (buf_priv->kernel_virtual && buf->total)
                                drm_core_ioremapfree(&buf_priv->map, dev);
@@ -309,7 +309,7 @@ static int i830_freelist_init(struct drm_device * dev, drm_i830_private_t * dev_
        }
 
        for (i = 0; i < dma->buf_count; i++) {
-               drm_buf_t *buf = dma->buflist[i];
+               struct drm_buf *buf = dma->buflist[i];
                drm_i830_buf_priv_t *buf_priv = buf->dev_private;
 
                buf_priv->in_use = hw_status++;
@@ -1087,7 +1087,7 @@ static void i830_dma_dispatch_flip(struct drm_device * dev)
 }
 
 static void i830_dma_dispatch_vertex(struct drm_device * dev,
-                                    drm_buf_t * buf, int discard, int used)
+                                    struct drm_buf * buf, int discard, int used)
 {
        drm_i830_private_t *dev_priv = dev->dev_private;
        drm_i830_buf_priv_t *buf_priv = buf->dev_private;
@@ -1232,7 +1232,7 @@ static int i830_flush_queue(struct drm_device * dev)
        i830_wait_ring(dev, dev_priv->ring.Size - 8, __FUNCTION__);
 
        for (i = 0; i < dma->buf_count; i++) {
-               drm_buf_t *buf = dma->buflist[i];
+               struct drm_buf *buf = dma->buflist[i];
                drm_i830_buf_priv_t *buf_priv = buf->dev_private;
 
                int used = cmpxchg(buf_priv->in_use, I830_BUF_HARDWARE,
@@ -1263,7 +1263,7 @@ static void i830_reclaim_buffers(struct drm_device * dev, struct file *filp)
        i830_flush_queue(dev);
 
        for (i = 0; i < dma->buf_count; i++) {
-               drm_buf_t *buf = dma->buflist[i];
+               struct drm_buf *buf = dma->buflist[i];
                drm_i830_buf_priv_t *buf_priv = buf->dev_private;
 
                if (buf->filp == filp && buf_priv) {

diff --git a/drivers/char/drm/i830_drv.h b/drivers/char/drm/i830_drv.h
index bf21703..ddda679 100644 (file)
--- a/drivers/char/drm/i830_drv.h
+++ b/drivers/char/drm/i830_drv.h
@@ -95,7 +95,7 @@ typedef struct drm_i830_private {
 
        dma_addr_t dma_status_page;
 
-       drm_buf_t *mmap_buffer;
+       struct drm_buf *mmap_buffer;
 
        u32 front_di1, back_di1, zi1;
 

diff --git a/drivers/char/drm/mga_dma.c b/drivers/char/drm/mga_dma.c
index 61feb6d..b5d41dc 100644 (file)
--- a/drivers/char/drm/mga_dma.c
+++ b/drivers/char/drm/mga_dma.c
@@ -248,7 +248,7 @@ static void mga_freelist_print(struct drm_device * dev)
 static int mga_freelist_init(struct drm_device * dev, drm_mga_private_t * dev_priv)
 {
        drm_device_dma_t *dma = dev->dma;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        drm_mga_buf_priv_t *buf_priv;
        drm_mga_freelist_t *entry;
        int i;
@@ -314,7 +314,7 @@ static void mga_freelist_cleanup(struct drm_device * dev)
 static void mga_freelist_reset(struct drm_device * dev)
 {
        drm_device_dma_t *dma = dev->dma;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        drm_mga_buf_priv_t *buf_priv;
        int i;
 
@@ -326,7 +326,7 @@ static void mga_freelist_reset(struct drm_device * dev)
 }
 #endif
 
-static drm_buf_t *mga_freelist_get(struct drm_device * dev)
+static struct drm_buf *mga_freelist_get(struct drm_device * dev)
 {
        drm_mga_private_t *dev_priv = dev->dev_private;
        drm_mga_freelist_t *next;
@@ -359,7 +359,7 @@ static drm_buf_t *mga_freelist_get(struct drm_device * dev)
        return NULL;
 }
 
-int mga_freelist_put(struct drm_device * dev, drm_buf_t * buf)
+int mga_freelist_put(struct drm_device * dev, struct drm_buf * buf)
 {
        drm_mga_private_t *dev_priv = dev->dev_private;
        drm_mga_buf_priv_t *buf_priv = buf->dev_private;
@@ -1088,7 +1088,7 @@ int mga_dma_reset(DRM_IOCTL_ARGS)
 
 static int mga_dma_get_buffers(DRMFILE filp, struct drm_device * dev, struct drm_dma * d)
 {
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        int i;
 
        for (i = d->granted_count; i < d->request_count; i++) {

diff --git a/drivers/char/drm/mga_drv.h b/drivers/char/drm/mga_drv.h
index bf38521..49253af 100644 (file)
--- a/drivers/char/drm/mga_drv.h
+++ b/drivers/char/drm/mga_drv.h
@@ -65,7 +65,7 @@ typedef struct drm_mga_freelist {
        struct drm_mga_freelist *next;
        struct drm_mga_freelist *prev;
        drm_mga_age_t age;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
 } drm_mga_freelist_t;
 
 typedef struct {
@@ -168,7 +168,7 @@ extern void mga_do_dma_flush(drm_mga_private_t * dev_priv);
 extern void mga_do_dma_wrap_start(drm_mga_private_t * dev_priv);
 extern void mga_do_dma_wrap_end(drm_mga_private_t * dev_priv);
 
-extern int mga_freelist_put(struct drm_device * dev, drm_buf_t * buf);
+extern int mga_freelist_put(struct drm_device * dev, struct drm_buf * buf);
 
                                /* mga_warp.c */
 extern unsigned int mga_warp_microcode_size(const drm_mga_private_t * dev_priv);

diff --git a/drivers/char/drm/mga_state.c b/drivers/char/drm/mga_state.c
index 6d5ab9f..62f7aca 100644 (file)
--- a/drivers/char/drm/mga_state.c
+++ b/drivers/char/drm/mga_state.c
@@ -622,7 +622,7 @@ static void mga_dma_dispatch_swap(struct drm_device * dev)
        DRM_DEBUG("%s... done.\n", __FUNCTION__);
 }
 
-static void mga_dma_dispatch_vertex(struct drm_device * dev, drm_buf_t * buf)
+static void mga_dma_dispatch_vertex(struct drm_device * dev, struct drm_buf * buf)
 {
        drm_mga_private_t *dev_priv = dev->dev_private;
        drm_mga_buf_priv_t *buf_priv = buf->dev_private;
@@ -669,7 +669,7 @@ static void mga_dma_dispatch_vertex(struct drm_device * dev, drm_buf_t * buf)
        FLUSH_DMA();
 }
 
-static void mga_dma_dispatch_indices(struct drm_device * dev, drm_buf_t * buf,
+static void mga_dma_dispatch_indices(struct drm_device * dev, struct drm_buf * buf,
                                     unsigned int start, unsigned int end)
 {
        drm_mga_private_t *dev_priv = dev->dev_private;
@@ -718,7 +718,7 @@ static void mga_dma_dispatch_indices(struct drm_device * dev, drm_buf_t * buf,
 /* This copies a 64 byte aligned agp region to the frambuffer with a
  * standard blit, the ioctl needs to do checking.
  */
-static void mga_dma_dispatch_iload(struct drm_device * dev, drm_buf_t * buf,
+static void mga_dma_dispatch_iload(struct drm_device * dev, struct drm_buf * buf,
                                   unsigned int dstorg, unsigned int length)
 {
        drm_mga_private_t *dev_priv = dev->dev_private;
@@ -881,7 +881,7 @@ static int mga_dma_vertex(DRM_IOCTL_ARGS)
        DRM_DEVICE;
        drm_mga_private_t *dev_priv = dev->dev_private;
        drm_device_dma_t *dma = dev->dma;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        drm_mga_buf_priv_t *buf_priv;
        drm_mga_vertex_t vertex;
 
@@ -921,7 +921,7 @@ static int mga_dma_indices(DRM_IOCTL_ARGS)
        DRM_DEVICE;
        drm_mga_private_t *dev_priv = dev->dev_private;
        drm_device_dma_t *dma = dev->dma;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        drm_mga_buf_priv_t *buf_priv;
        drm_mga_indices_t indices;
 
@@ -961,7 +961,7 @@ static int mga_dma_iload(DRM_IOCTL_ARGS)
        DRM_DEVICE;
        drm_device_dma_t *dma = dev->dma;
        drm_mga_private_t *dev_priv = dev->dev_private;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        drm_mga_buf_priv_t *buf_priv;
        drm_mga_iload_t iload;
        DRM_DEBUG("\n");

diff --git a/drivers/char/drm/r128_cce.c b/drivers/char/drm/r128_cce.c
index d1e762e..70ba703 100644 (file)
--- a/drivers/char/drm/r128_cce.c
+++ b/drivers/char/drm/r128_cce.c
@@ -773,7 +773,7 @@ static int r128_freelist_init(struct drm_device * dev)
 {
        drm_device_dma_t *dma = dev->dma;
        drm_r128_private_t *dev_priv = dev->dev_private;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        drm_r128_buf_priv_t *buf_priv;
        drm_r128_freelist_t *entry;
        int i;
@@ -815,12 +815,12 @@ static int r128_freelist_init(struct drm_device * dev)
 }
 #endif
 
-static drm_buf_t *r128_freelist_get(struct drm_device * dev)
+static struct drm_buf *r128_freelist_get(struct drm_device * dev)
 {
        drm_device_dma_t *dma = dev->dma;
        drm_r128_private_t *dev_priv = dev->dev_private;
        drm_r128_buf_priv_t *buf_priv;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        int i, t;
 
        /* FIXME: Optimize -- use freelist code */
@@ -859,7 +859,7 @@ void r128_freelist_reset(struct drm_device * dev)
        int i;
 
        for (i = 0; i < dma->buf_count; i++) {
-               drm_buf_t *buf = dma->buflist[i];
+               struct drm_buf *buf = dma->buflist[i];
                drm_r128_buf_priv_t *buf_priv = buf->dev_private;
                buf_priv->age = 0;
        }
@@ -889,7 +889,7 @@ int r128_wait_ring(drm_r128_private_t * dev_priv, int n)
 static int r128_cce_get_buffers(DRMFILE filp, struct drm_device * dev, struct drm_dma * d)
 {
        int i;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
 
        for (i = d->granted_count; i < d->request_count; i++) {
                buf = r128_freelist_get(dev);

diff --git a/drivers/char/drm/r128_drv.h b/drivers/char/drm/r128_drv.h
index 1e3deab..8eb302e 100644 (file)
--- a/drivers/char/drm/r128_drv.h
+++ b/drivers/char/drm/r128_drv.h
@@ -57,7 +57,7 @@
 
 typedef struct drm_r128_freelist {
        unsigned int age;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        struct drm_r128_freelist *next;
        struct drm_r128_freelist *prev;
 } drm_r128_freelist_t;

diff --git a/drivers/char/drm/r128_state.c b/drivers/char/drm/r128_state.c
index 21d445e..1fdfeb8 100644 (file)
--- a/drivers/char/drm/r128_state.c
+++ b/drivers/char/drm/r128_state.c
@@ -567,7 +567,7 @@ static void r128_cce_dispatch_flip(struct drm_device * dev)
        ADVANCE_RING();
 }
 
-static void r128_cce_dispatch_vertex(struct drm_device * dev, drm_buf_t * buf)
+static void r128_cce_dispatch_vertex(struct drm_device * dev, struct drm_buf * buf)
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
        drm_r128_buf_priv_t *buf_priv = buf->dev_private;
@@ -638,7 +638,7 @@ static void r128_cce_dispatch_vertex(struct drm_device * dev, drm_buf_t * buf)
 }
 
 static void r128_cce_dispatch_indirect(struct drm_device * dev,
-                                      drm_buf_t * buf, int start, int end)
+                                      struct drm_buf * buf, int start, int end)
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
        drm_r128_buf_priv_t *buf_priv = buf->dev_private;
@@ -693,7 +693,7 @@ static void r128_cce_dispatch_indirect(struct drm_device * dev,
 }
 
 static void r128_cce_dispatch_indices(struct drm_device * dev,
-                                     drm_buf_t * buf,
+                                     struct drm_buf * buf,
                                      int start, int end, int count)
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
@@ -781,7 +781,7 @@ static int r128_cce_dispatch_blit(DRMFILE filp,
 {
        drm_r128_private_t *dev_priv = dev->dev_private;
        drm_device_dma_t *dma = dev->dma;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        drm_r128_buf_priv_t *buf_priv;
        u32 *data;
        int dword_shift, dwords;
@@ -1355,7 +1355,7 @@ static int r128_cce_vertex(DRM_IOCTL_ARGS)
        DRM_DEVICE;
        drm_r128_private_t *dev_priv = dev->dev_private;
        drm_device_dma_t *dma = dev->dma;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        drm_r128_buf_priv_t *buf_priv;
        drm_r128_vertex_t vertex;
 
@@ -1414,7 +1414,7 @@ static int r128_cce_indices(DRM_IOCTL_ARGS)
        DRM_DEVICE;
        drm_r128_private_t *dev_priv = dev->dev_private;
        drm_device_dma_t *dma = dev->dma;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        drm_r128_buf_priv_t *buf_priv;
        drm_r128_indices_t elts;
        int count;
@@ -1572,7 +1572,7 @@ static int r128_cce_indirect(DRM_IOCTL_ARGS)
        DRM_DEVICE;
        drm_r128_private_t *dev_priv = dev->dev_private;
        drm_device_dma_t *dma = dev->dma;
-       drm_buf_t *buf;
+       struct drm_buf *buf;
        drm_r128_buf_priv_t *buf_priv;
        drm_r128_indirect_t indirect;
 #if 0

diff --cc drivers/char/drm/r300_cmdbuf.c
Simple merge

diff --cc drivers/char/drm/radeon_cp.c
Simple merge

diff --cc drivers/char/drm/radeon_drv.h
Simple merge

diff --cc drivers/char/drm/radeon_state.c
Simple merge

diff --cc drivers/char/drm/savage_bci.c
Simple merge

diff --cc drivers/char/drm/savage_drv.h
Simple merge

diff --cc drivers/char/drm/savage_state.c
Simple merge