Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 056219e2 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm: drop drm_buf_t typedef 



Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent eddca551

drivers/char/drm/drmP.h

+10 −10
Original line number Diff line number Diff line
@@ -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) */

drivers/char/drm/drm_bufs.c

+9 −9
Original line number Diff line number Diff line
@@ -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;

drivers/char/drm/drm_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/char/drm/i810_dma.c

+13 −13
Original line number Diff line number Diff line
@@ -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;

drivers/char/drm/i810_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -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;