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

Commit eddca551 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm: fixup other drivers for typedef removals 



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

drivers/char/drm/i810_dma.c

+62 −62
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(drm_device_t * dev)

static drm_buf_t *i810_freelist_get(struct drm_device * dev)

{

	drm_device_dma_t *dma = dev->dma;

	int i;
@@ -70,7 +70,7 @@ static drm_buf_t *i810_freelist_get(drm_device_t * dev) 
 * yet, the hardware updates in use for us once its on the ring buffer.

 */



static int i810_freelist_put(drm_device_t * dev, drm_buf_t * buf)

static int i810_freelist_put(struct drm_device * dev, drm_buf_t * buf)

{

	drm_i810_buf_priv_t *buf_priv = buf->dev_private;

	int used;
@@ -87,8 +87,8 @@ static int i810_freelist_put(drm_device_t * dev, drm_buf_t * buf) 


static int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma)

{

	drm_file_t *priv = filp->private_data;

	drm_device_t *dev;

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev;

	drm_i810_private_t *dev_priv;

	drm_buf_t *buf;

	drm_i810_buf_priv_t *buf_priv;
@@ -122,8 +122,8 @@ static const struct file_operations i810_buffer_fops = { 


static int i810_map_buffer(drm_buf_t * buf, struct file *filp)

{

	drm_file_t *priv = filp->private_data;

	drm_device_t *dev = priv->head->dev;

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = priv->head->dev;

	drm_i810_buf_priv_t *buf_priv = buf->dev_private;

	drm_i810_private_t *dev_priv = dev->dev_private;

	const struct file_operations *old_fops;
@@ -172,7 +172,7 @@ static int i810_unmap_buffer(drm_buf_t * buf) 
	return retcode;

}



static int i810_dma_get_buffer(drm_device_t * dev, drm_i810_dma_t * d,

static int i810_dma_get_buffer(struct drm_device * dev, drm_i810_dma_t * d,

			       struct file *filp)

{

	drm_buf_t *buf;
@@ -202,7 +202,7 @@ static int i810_dma_get_buffer(drm_device_t * dev, drm_i810_dma_t * d, 
	return retcode;

}



static int i810_dma_cleanup(drm_device_t * dev)

static int i810_dma_cleanup(struct drm_device * dev)

{

	drm_device_dma_t *dma = dev->dma;
@@ -243,7 +243,7 @@ static int i810_dma_cleanup(drm_device_t * dev) 
	return 0;

}



static int i810_wait_ring(drm_device_t * dev, int n)

static int i810_wait_ring(struct drm_device * dev, int n)

{

	drm_i810_private_t *dev_priv = dev->dev_private;

	drm_i810_ring_buffer_t *ring = &(dev_priv->ring);
@@ -276,7 +276,7 @@ static int i810_wait_ring(drm_device_t * dev, int n) 
	return iters;

}



static void i810_kernel_lost_context(drm_device_t * dev)

static void i810_kernel_lost_context(struct drm_device * dev)

{

	drm_i810_private_t *dev_priv = dev->dev_private;

	drm_i810_ring_buffer_t *ring = &(dev_priv->ring);
@@ -288,7 +288,7 @@ static void i810_kernel_lost_context(drm_device_t * dev) 
		ring->space += ring->Size;

}



static int i810_freelist_init(drm_device_t * dev, drm_i810_private_t * dev_priv)

static int i810_freelist_init(struct drm_device * dev, drm_i810_private_t * dev_priv)

{

	drm_device_dma_t *dma = dev->dma;

	int my_idx = 24;
@@ -323,7 +323,7 @@ static int i810_freelist_init(drm_device_t * dev, drm_i810_private_t * dev_priv) 
	return 0;

}



static int i810_dma_initialize(drm_device_t * dev,

static int i810_dma_initialize(struct drm_device * dev,

			       drm_i810_private_t * dev_priv,

			       drm_i810_init_t * init)

{
@@ -476,8 +476,8 @@ static int i810_dma_init_compat(drm_i810_init_t * init, unsigned long arg) 
static int i810_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->head->dev;

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = priv->head->dev;

	drm_i810_private_t *dev_priv;

	drm_i810_init_t init;

	int retcode = 0;
@@ -534,7 +534,7 @@ static int i810_dma_init(struct inode *inode, struct file *filp, 
 * Use 'volatile' & local var tmp to force the emitted values to be

 * identical to the verified ones.

 */

static void i810EmitContextVerified(drm_device_t * dev,

static void i810EmitContextVerified(struct drm_device * dev,

				    volatile unsigned int *code)

{

	drm_i810_private_t *dev_priv = dev->dev_private;
@@ -567,7 +567,7 @@ static void i810EmitContextVerified(drm_device_t * dev, 
	ADVANCE_LP_RING();

}



static void i810EmitTexVerified(drm_device_t * dev, volatile unsigned int *code)

static void i810EmitTexVerified(struct drm_device * dev, volatile unsigned int *code)

{

	drm_i810_private_t *dev_priv = dev->dev_private;

	int i, j = 0;
@@ -600,7 +600,7 @@ static void i810EmitTexVerified(drm_device_t * dev, volatile unsigned int *code) 


/* Need to do some additional checking when setting the dest buffer.

 */

static void i810EmitDestVerified(drm_device_t * dev,

static void i810EmitDestVerified(struct drm_device * dev,

				 volatile unsigned int *code)

{

	drm_i810_private_t *dev_priv = dev->dev_private;
@@ -635,7 +635,7 @@ static void i810EmitDestVerified(drm_device_t * dev, 
	ADVANCE_LP_RING();

}



static void i810EmitState(drm_device_t * dev)

static void i810EmitState(struct drm_device * dev)

{

	drm_i810_private_t *dev_priv = dev->dev_private;

	drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;
@@ -666,14 +666,14 @@ static void i810EmitState(drm_device_t * dev) 


/* need to verify

 */

static void i810_dma_dispatch_clear(drm_device_t * dev, int flags,

static void i810_dma_dispatch_clear(struct drm_device * dev, int flags,

				    unsigned int clear_color,

				    unsigned int clear_zval)

{

	drm_i810_private_t *dev_priv = dev->dev_private;

	drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;

	int nbox = sarea_priv->nbox;

	drm_clip_rect_t *pbox = sarea_priv->boxes;

	struct drm_clip_rect *pbox = sarea_priv->boxes;

	int pitch = dev_priv->pitch;

	int cpp = 2;

	int i;
@@ -741,12 +741,12 @@ static void i810_dma_dispatch_clear(drm_device_t * dev, int flags, 
	}

}



static void i810_dma_dispatch_swap(drm_device_t * dev)

static void i810_dma_dispatch_swap(struct drm_device * dev)

{

	drm_i810_private_t *dev_priv = dev->dev_private;

	drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;

	int nbox = sarea_priv->nbox;

	drm_clip_rect_t *pbox = sarea_priv->boxes;

	struct drm_clip_rect *pbox = sarea_priv->boxes;

	int pitch = dev_priv->pitch;

	int cpp = 2;

	int i;
@@ -787,13 +787,13 @@ static void i810_dma_dispatch_swap(drm_device_t * dev) 
	}

}



static void i810_dma_dispatch_vertex(drm_device_t * dev,

static void i810_dma_dispatch_vertex(struct drm_device * dev,

				     drm_buf_t * buf, int discard, int used)

{

	drm_i810_private_t *dev_priv = dev->dev_private;

	drm_i810_buf_priv_t *buf_priv = buf->dev_private;

	drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;

	drm_clip_rect_t *box = sarea_priv->boxes;

	struct drm_clip_rect *box = sarea_priv->boxes;

	int nbox = sarea_priv->nbox;

	unsigned long address = (unsigned long)buf->bus_address;

	unsigned long start = address - dev->agp->base;
@@ -867,7 +867,7 @@ static void i810_dma_dispatch_vertex(drm_device_t * dev, 
	}

}



static void i810_dma_dispatch_flip(drm_device_t * dev)

static void i810_dma_dispatch_flip(struct drm_device * dev)

{

	drm_i810_private_t *dev_priv = dev->dev_private;

	int pitch = dev_priv->pitch;
@@ -914,7 +914,7 @@ static void i810_dma_dispatch_flip(drm_device_t * dev) 


}



static void i810_dma_quiescent(drm_device_t * dev)

static void i810_dma_quiescent(struct drm_device * dev)

{

	drm_i810_private_t *dev_priv = dev->dev_private;

	RING_LOCALS;
@@ -933,7 +933,7 @@ static void i810_dma_quiescent(drm_device_t * dev) 
	i810_wait_ring(dev, dev_priv->ring.Size - 8);

}



static int i810_flush_queue(drm_device_t * dev)

static int i810_flush_queue(struct drm_device * dev)

{

	drm_i810_private_t *dev_priv = dev->dev_private;

	drm_device_dma_t *dma = dev->dma;
@@ -968,7 +968,7 @@ static int i810_flush_queue(drm_device_t * dev) 
}



/* Must be called with the lock held */

static void i810_reclaim_buffers(drm_device_t * dev, struct file *filp)

static void i810_reclaim_buffers(struct drm_device * dev, struct file *filp)

{

	drm_device_dma_t *dma = dev->dma;

	int i;
@@ -1001,8 +1001,8 @@ static void i810_reclaim_buffers(drm_device_t * dev, struct file *filp) 
static int i810_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->head->dev;

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = priv->head->dev;



	LOCK_TEST_WITH_RETURN(dev, filp);
@@ -1013,8 +1013,8 @@ static int i810_flush_ioctl(struct inode *inode, struct file *filp, 
static int i810_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->head->dev;

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = priv->head->dev;

	drm_device_dma_t *dma = dev->dma;

	drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private;

	u32 *hw_status = dev_priv->hw_status_page;
@@ -1049,8 +1049,8 @@ static int i810_dma_vertex(struct inode *inode, struct file *filp, 
static int i810_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->head->dev;

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = priv->head->dev;

	drm_i810_clear_t clear;



	if (copy_from_user
@@ -1072,8 +1072,8 @@ static int i810_clear_bufs(struct inode *inode, struct file *filp, 
static int i810_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->head->dev;

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = priv->head->dev;



	DRM_DEBUG("i810_swap_bufs\n");
@@ -1086,8 +1086,8 @@ static int i810_swap_bufs(struct inode *inode, struct file *filp, 
static int i810_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->head->dev;

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = priv->head->dev;

	drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private;

	u32 *hw_status = dev_priv->hw_status_page;

	drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *)
@@ -1100,8 +1100,8 @@ static int i810_getage(struct inode *inode, struct file *filp, unsigned int cmd, 
static int i810_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->head->dev;

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = priv->head->dev;

	int retcode = 0;

	drm_i810_dma_t d;

	drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private;
@@ -1121,7 +1121,7 @@ static int i810_getbuf(struct inode *inode, struct file *filp, unsigned int cmd, 
	DRM_DEBUG("i810_dma: %d returning %d, granted = %d\n",

		  current->pid, retcode, d.granted);



	if (copy_to_user((drm_dma_t __user *) arg, &d, sizeof(d)))

	if (copy_to_user((void __user *) arg, &d, sizeof(d)))

		return -EFAULT;

	sarea_priv->last_dispatch = (int)hw_status[5];
@@ -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(drm_device_t * dev, drm_buf_t * buf, int used,

static void i810_dma_dispatch_mc(struct drm_device * dev, drm_buf_t * buf, int used,

				 unsigned int last_render)

{

	drm_i810_private_t *dev_priv = dev->dev_private;
@@ -1205,8 +1205,8 @@ static void i810_dma_dispatch_mc(drm_device_t * dev, drm_buf_t * buf, int used, 
static int i810_dma_mc(struct inode *inode, struct file *filp,

		       unsigned int cmd, unsigned long arg)

{

	drm_file_t *priv = filp->private_data;

	drm_device_t *dev = priv->head->dev;

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = priv->head->dev;

	drm_device_dma_t *dma = dev->dma;

	drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private;

	u32 *hw_status = dev_priv->hw_status_page;
@@ -1236,8 +1236,8 @@ static int i810_dma_mc(struct inode *inode, struct file *filp, 
static int i810_rstatus(struct inode *inode, struct file *filp,

			unsigned int cmd, unsigned long arg)

{

	drm_file_t *priv = filp->private_data;

	drm_device_t *dev = priv->head->dev;

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = priv->head->dev;

	drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private;



	return (int)(((u32 *) (dev_priv->hw_status_page))[4]);
@@ -1246,8 +1246,8 @@ static int i810_rstatus(struct inode *inode, struct file *filp, 
static int i810_ov0_info(struct inode *inode, struct file *filp,

			 unsigned int cmd, unsigned long arg)

{

	drm_file_t *priv = filp->private_data;

	drm_device_t *dev = priv->head->dev;

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = priv->head->dev;

	drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private;

	drm_i810_overlay_t data;
@@ -1262,8 +1262,8 @@ static int i810_ov0_info(struct inode *inode, struct file *filp, 
static int i810_fstatus(struct inode *inode, struct file *filp,

			unsigned int cmd, unsigned long arg)

{

	drm_file_t *priv = filp->private_data;

	drm_device_t *dev = priv->head->dev;

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = priv->head->dev;

	drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private;



	LOCK_TEST_WITH_RETURN(dev, filp);
@@ -1274,8 +1274,8 @@ static int i810_fstatus(struct inode *inode, struct file *filp, 
static int i810_ov0_flip(struct inode *inode, struct file *filp,

			 unsigned int cmd, unsigned long arg)

{

	drm_file_t *priv = filp->private_data;

	drm_device_t *dev = priv->head->dev;

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = priv->head->dev;

	drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private;



	LOCK_TEST_WITH_RETURN(dev, filp);
@@ -1288,7 +1288,7 @@ static int i810_ov0_flip(struct inode *inode, struct file *filp, 


/* Not sure why this isn't set all the time:

 */

static void i810_do_init_pageflip(drm_device_t * dev)

static void i810_do_init_pageflip(struct drm_device * dev)

{

	drm_i810_private_t *dev_priv = dev->dev_private;
@@ -1298,7 +1298,7 @@ static void i810_do_init_pageflip(drm_device_t * dev) 
	dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;

}



static int i810_do_cleanup_pageflip(drm_device_t * dev)

static int i810_do_cleanup_pageflip(struct drm_device * dev)

{

	drm_i810_private_t *dev_priv = dev->dev_private;
@@ -1313,8 +1313,8 @@ static int i810_do_cleanup_pageflip(drm_device_t * dev) 
static int i810_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->head->dev;

	struct drm_file *priv = filp->private_data;

	struct drm_device *dev = priv->head->dev;

	drm_i810_private_t *dev_priv = dev->dev_private;



	DRM_DEBUG("%s\n", __FUNCTION__);
@@ -1328,7 +1328,7 @@ static int i810_flip_bufs(struct inode *inode, struct file *filp, 
	return 0;

}



int i810_driver_load(drm_device_t *dev, unsigned long flags)

int i810_driver_load(struct drm_device *dev, unsigned long flags)

{

	/* i810 has 4 more counters */

	dev->counters += 4;
@@ -1340,12 +1340,12 @@ int i810_driver_load(drm_device_t *dev, unsigned long flags) 
	return 0;

}



void i810_driver_lastclose(drm_device_t * dev)

void i810_driver_lastclose(struct drm_device * dev)

{

	i810_dma_cleanup(dev);

}



void i810_driver_preclose(drm_device_t * dev, DRMFILE filp)

void i810_driver_preclose(struct drm_device * dev, DRMFILE filp)

{

	if (dev->dev_private) {

		drm_i810_private_t *dev_priv = dev->dev_private;
@@ -1355,12 +1355,12 @@ void i810_driver_preclose(drm_device_t * dev, DRMFILE filp) 
	}

}



void i810_driver_reclaim_buffers_locked(drm_device_t * dev, struct file *filp)

void i810_driver_reclaim_buffers_locked(struct drm_device * dev, struct file *filp)

{

	i810_reclaim_buffers(dev, filp);

}



int i810_driver_dma_quiescent(drm_device_t * dev)

int i810_driver_dma_quiescent(struct drm_device * dev)

{

	i810_dma_quiescent(dev);

	return 0;
@@ -1397,7 +1397,7 @@ int i810_max_ioctl = DRM_ARRAY_SIZE(i810_ioctls); 
 * \returns

 * A value of 1 is always retured to indictate every i810 is AGP.

 */

int i810_driver_device_is_agp(drm_device_t * dev)

int i810_driver_device_is_agp(struct drm_device * dev)

{

	return 1;

}

drivers/char/drm/i810_drm.h

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ typedef struct _drm_i810_sarea { 
	unsigned int dirty;



	unsigned int nbox;

	drm_clip_rect_t boxes[I810_NR_SAREA_CLIPRECTS];

	struct drm_clip_rect boxes[I810_NR_SAREA_CLIPRECTS];



	/* Maintain an LRU of contiguous regions of texture space.  If

	 * you think you own a region of texture memory, and it has an

drivers/char/drm/i810_drv.h

+8 −8
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ typedef struct _drm_i810_ring_buffer { 
} drm_i810_ring_buffer_t;



typedef struct drm_i810_private {

	drm_map_t *sarea_map;

	drm_map_t *mmio_map;

	struct drm_map *sarea_map;

	struct drm_map *mmio_map;



	drm_i810_sarea_t *sarea_priv;

	drm_i810_ring_buffer_t ring;
@@ -115,15 +115,15 @@ typedef struct drm_i810_private { 
} drm_i810_private_t;



				/* i810_dma.c */

extern int i810_driver_dma_quiescent(drm_device_t * dev);

extern void i810_driver_reclaim_buffers_locked(drm_device_t * dev,

extern int i810_driver_dma_quiescent(struct drm_device * dev);

extern void i810_driver_reclaim_buffers_locked(struct drm_device * dev,

					       struct file *filp);

extern int i810_driver_load(struct drm_device *, unsigned long flags);

extern void i810_driver_lastclose(drm_device_t * dev);

extern void i810_driver_preclose(drm_device_t * dev, DRMFILE filp);

extern void i810_driver_reclaim_buffers_locked(drm_device_t * dev,

extern void i810_driver_lastclose(struct drm_device * dev);

extern void i810_driver_preclose(struct drm_device * dev, DRMFILE filp);

extern void i810_driver_reclaim_buffers_locked(struct drm_device * dev,

					       struct file *filp);

extern int i810_driver_device_is_agp(drm_device_t * dev);

extern int i810_driver_device_is_agp(struct drm_device * dev);



extern drm_ioctl_desc_t i810_ioctls[];

extern int i810_max_ioctl;

drivers/char/drm/i830_dma.c

+60 −60

File changed.

Preview size limit exceeded, changes collapsed.

drivers/char/drm/i830_drm.h

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ typedef struct _drm_i830_sarea { 
	unsigned int dirty;



	unsigned int nbox;

	drm_clip_rect_t boxes[I830_NR_SAREA_CLIPRECTS];

	struct drm_clip_rect boxes[I830_NR_SAREA_CLIPRECTS];



	/* Maintain an LRU of contiguous regions of texture space.  If

	 * you think you own a region of texture memory, and it has an