Skip to content

L
linux
Commit cdd55a29 authored by Dave Airlie's avatar Dave Airlie
Browse files
Options

drm: detypef waitlist/freelist/buf_entry/device_dma/drm_queue structs 

Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 8fc2fdf4
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 80 deletions
drivers/char/drm/drmP.h
View file @ cdd55a29
...@@ -319,7 +319,7 @@ struct drm_buf { ...@@ -319,7 +319,7 @@ struct drm_buf {
}; };
/** bufs is one longer than it has to be */ /** bufs is one longer than it has to be */
typedef struct drm_waitlist { struct drm_waitlist {
int count; /**< Number of possible buffers */ int count; /**< Number of possible buffers */
struct drm_buf **bufs; /**< List of pointers to buffers */ struct drm_buf **bufs; /**< List of pointers to buffers */
struct drm_buf **rp; /**< Read pointer */ struct drm_buf **rp; /**< Read pointer */
...@@ -327,9 +327,9 @@ typedef struct drm_waitlist { ...@@ -327,9 +327,9 @@ typedef struct drm_waitlist {
struct drm_buf **end; /**< End pointer */ struct drm_buf **end; /**< End pointer */
spinlock_t read_lock; spinlock_t read_lock;
spinlock_t write_lock; spinlock_t write_lock;
} drm_waitlist_t; };
typedef struct drm_freelist { struct drm_freelist {
int initialized; /**< Freelist in use */ int initialized; /**< Freelist in use */
atomic_t count; /**< Number of free buffers */ atomic_t count; /**< Number of free buffers */
struct drm_buf *next; /**< End pointer */ struct drm_buf *next; /**< End pointer */
...@@ -339,7 +339,7 @@ typedef struct drm_freelist { ...@@ -339,7 +339,7 @@ typedef struct drm_freelist {
int high_mark; /**< High water mark */ int high_mark; /**< High water mark */
atomic_t wfh; /**< If waiting for high mark */ atomic_t wfh; /**< If waiting for high mark */
spinlock_t lock; spinlock_t lock;
} drm_freelist_t; };
typedef struct drm_dma_handle { typedef struct drm_dma_handle {
dma_addr_t busaddr; dma_addr_t busaddr;
...@@ -350,16 +350,16 @@ typedef struct drm_dma_handle { ...@@ -350,16 +350,16 @@ typedef struct drm_dma_handle {
/** /**
* Buffer entry. There is one of this for each buffer size order. * Buffer entry. There is one of this for each buffer size order.
*/ */
typedef struct drm_buf_entry { struct drm_buf_entry {
int buf_size; /**< size */ int buf_size; /**< size */
int buf_count; /**< number of buffers */ int buf_count; /**< number of buffers */
struct drm_buf *buflist; /**< buffer list */ struct drm_buf *buflist; /**< buffer list */
int seg_count; int seg_count;
int page_order; int page_order;
drm_dma_handle_t **seglist; struct drm_dma_handle **seglist;
drm_freelist_t freelist; struct drm_freelist freelist;
} drm_buf_entry_t; };
/** File private data */ /** File private data */
struct drm_file { struct drm_file {
...@@ -378,7 +378,7 @@ struct drm_file { ...@@ -378,7 +378,7 @@ struct drm_file {
}; };
/** Wait queue */ /** Wait queue */
typedef struct drm_queue { struct drm_queue {
atomic_t use_count; /**< Outstanding uses (+1) */ atomic_t use_count; /**< Outstanding uses (+1) */
atomic_t finalization; /**< Finalization in progress */ atomic_t finalization; /**< Finalization in progress */
atomic_t block_count; /**< Count of processes waiting */ atomic_t block_count; /**< Count of processes waiting */
...@@ -392,9 +392,9 @@ typedef struct drm_queue { ...@@ -392,9 +392,9 @@ typedef struct drm_queue {
atomic_t total_locks; /**< Total locks statistics */ atomic_t total_locks; /**< Total locks statistics */
#endif #endif
enum drm_ctx_flags flags; /**< Context preserving and 2D-only */ enum drm_ctx_flags flags; /**< Context preserving and 2D-only */
drm_waitlist_t waitlist; /**< Pending buffers */ struct drm_waitlist waitlist; /**< Pending buffers */
wait_queue_head_t flush_queue; /**< Processes waiting until flush */ wait_queue_head_t flush_queue; /**< Processes waiting until flush */
} drm_queue_t; };
/** /**
* Lock data. * Lock data.
...@@ -413,9 +413,9 @@ typedef struct drm_lock_data { ...@@ -413,9 +413,9 @@ typedef struct drm_lock_data {
/** /**
* DMA data. * DMA data.
*/ */
typedef struct drm_device_dma { struct drm_device_dma {
drm_buf_entry_t bufs[DRM_MAX_ORDER + 1]; /**< buffers, grouped by their size order */ struct drm_buf_entry bufs[DRM_MAX_ORDER + 1]; /**< buffers, grouped by their size order */
int buf_count; /**< total number of buffers */ int buf_count; /**< total number of buffers */
struct drm_buf **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 seg_count;
...@@ -429,7 +429,7 @@ typedef struct drm_device_dma { ...@@ -429,7 +429,7 @@ typedef struct drm_device_dma {
_DRM_DMA_USE_PCI_RO = 0x08 _DRM_DMA_USE_PCI_RO = 0x08
} flags; } flags;
} drm_device_dma_t; };
/** /**
* AGP memory entry. Stored as a doubly linked list. * AGP memory entry. Stored as a doubly linked list.
...@@ -688,8 +688,8 @@ struct drm_device { ...@@ -688,8 +688,8 @@ struct drm_device {
int queue_count; /**< Number of active DMA queues */ int queue_count; /**< Number of active DMA queues */
int queue_reserved; /**< Number of reserved DMA queues */ int queue_reserved; /**< Number of reserved DMA queues */
int queue_slots; /**< Actual length of queuelist */ int queue_slots; /**< Actual length of queuelist */
drm_queue_t **queuelist; /**< Vector of pointers to DMA queues */ struct drm_queue **queuelist; /**< Vector of pointers to DMA queues */
drm_device_dma_t *dma; /**< Optional pointer for DMA support */ struct drm_device_dma *dma; /**< Optional pointer for DMA support */
/*@} */ /*@} */
/** \name Context support */ /** \name Context support */
......
drivers/char/drm/drm_bufs.c
View file @ cdd55a29
...@@ -504,7 +504,8 @@ int drm_rmmap_ioctl(struct inode *inode, struct file *filp, ...@@ -504,7 +504,8 @@ int drm_rmmap_ioctl(struct inode *inode, struct file *filp,
* *
* Frees any pages and buffers associated with the given entry. * Frees any pages and buffers associated with the given entry.
*/ */
static void drm_cleanup_buf_error(struct drm_device * dev, drm_buf_entry_t * entry) static void drm_cleanup_buf_error(struct drm_device * dev,
struct drm_buf_entry * entry)
{ {
int i; int i;
...@@ -551,8 +552,8 @@ static void drm_cleanup_buf_error(struct drm_device * dev, drm_buf_entry_t * ent ...@@ -551,8 +552,8 @@ static void drm_cleanup_buf_error(struct drm_device * dev, drm_buf_entry_t * ent
*/ */
int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request)
{ {
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
drm_buf_entry_t *entry; struct drm_buf_entry *entry;
drm_agp_mem_t *agp_entry; drm_agp_mem_t *agp_entry;
struct drm_buf *buf; struct drm_buf *buf;
unsigned long offset; unsigned long offset;
...@@ -721,13 +722,13 @@ EXPORT_SYMBOL(drm_addbufs_agp); ...@@ -721,13 +722,13 @@ EXPORT_SYMBOL(drm_addbufs_agp);
int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request)
{ {
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
int count; int count;
int order; int order;
int size; int size;
int total; int total;
int page_order; int page_order;
drm_buf_entry_t *entry; struct drm_buf_entry *entry;
drm_dma_handle_t *dmah; drm_dma_handle_t *dmah;
struct drm_buf *buf; struct drm_buf *buf;
int alignment; int alignment;
...@@ -947,8 +948,8 @@ EXPORT_SYMBOL(drm_addbufs_pci); ...@@ -947,8 +948,8 @@ EXPORT_SYMBOL(drm_addbufs_pci);
static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request) static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request)
{ {
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
drm_buf_entry_t *entry; struct drm_buf_entry *entry;
struct drm_buf *buf; struct drm_buf *buf;
unsigned long offset; unsigned long offset;
unsigned long agp_offset; unsigned long agp_offset;
...@@ -1109,8 +1110,8 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request ...@@ -1109,8 +1110,8 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request
static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request) static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request)
{ {
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
drm_buf_entry_t *entry; struct drm_buf_entry *entry;
struct drm_buf *buf; struct drm_buf *buf;
unsigned long offset; unsigned long offset;
unsigned long agp_offset; unsigned long agp_offset;
...@@ -1339,7 +1340,7 @@ int drm_infobufs(struct inode *inode, struct file *filp, ...@@ -1339,7 +1340,7 @@ int drm_infobufs(struct inode *inode, struct file *filp,
{ {
struct drm_file *priv = filp->private_data; struct drm_file *priv = filp->private_data;
struct drm_device *dev = priv->head->dev; struct drm_device *dev = priv->head->dev;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_buf_info request; struct drm_buf_info request;
struct drm_buf_info __user *argp = (void __user *)arg; struct drm_buf_info __user *argp = (void __user *)arg;
int i; int i;
...@@ -1374,8 +1375,8 @@ int drm_infobufs(struct inode *inode, struct file *filp, ...@@ -1374,8 +1375,8 @@ int drm_infobufs(struct inode *inode, struct file *filp,
if (dma->bufs[i].buf_count) { if (dma->bufs[i].buf_count) {
struct drm_buf_desc __user *to = struct drm_buf_desc __user *to =
&request.list[count]; &request.list[count];
drm_buf_entry_t *from = &dma->bufs[i]; struct drm_buf_entry *from = &dma->bufs[i];
drm_freelist_t *list = &dma->bufs[i].freelist; struct drm_freelist *list = &dma->bufs[i].freelist;
if (copy_to_user(&to->count, if (copy_to_user(&to->count,
&from->buf_count, &from->buf_count,
sizeof(from->buf_count)) || sizeof(from->buf_count)) ||
...@@ -1427,10 +1428,10 @@ int drm_markbufs(struct inode *inode, struct file *filp, ...@@ -1427,10 +1428,10 @@ int drm_markbufs(struct inode *inode, struct file *filp,
{ {
struct drm_file *priv = filp->private_data; struct drm_file *priv = filp->private_data;
struct drm_device *dev = priv->head->dev; struct drm_device *dev = priv->head->dev;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_buf_desc request; struct drm_buf_desc request;
int order; int order;
drm_buf_entry_t *entry; struct drm_buf_entry *entry;
if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA)) if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA))
return -EINVAL; return -EINVAL;
...@@ -1477,7 +1478,7 @@ int drm_freebufs(struct inode *inode, struct file *filp, ...@@ -1477,7 +1478,7 @@ int drm_freebufs(struct inode *inode, struct file *filp,
{ {
struct drm_file *priv = filp->private_data; struct drm_file *priv = filp->private_data;
struct drm_device *dev = priv->head->dev; struct drm_device *dev = priv->head->dev;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_buf_free request; struct drm_buf_free request;
int i; int i;
int idx; int idx;
...@@ -1533,7 +1534,7 @@ int drm_mapbufs(struct inode *inode, struct file *filp, ...@@ -1533,7 +1534,7 @@ int drm_mapbufs(struct inode *inode, struct file *filp,
{ {
struct drm_file *priv = filp->private_data; struct drm_file *priv = filp->private_data;
struct drm_device *dev = priv->head->dev; struct drm_device *dev = priv->head->dev;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_buf_map __user *argp = (void __user *)arg; struct drm_buf_map __user *argp = (void __user *)arg;
int retcode = 0; int retcode = 0;
const int zero = 0; const int zero = 0;
......
drivers/char/drm/drm_dma.c
View file @ cdd55a29
...@@ -69,7 +69,7 @@ int drm_dma_setup(struct drm_device *dev) ...@@ -69,7 +69,7 @@ int drm_dma_setup(struct drm_device *dev)
*/ */
void drm_dma_takedown(struct drm_device *dev) void drm_dma_takedown(struct drm_device *dev)
{ {
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
int i, j; int i, j;
if (!dma) if (!dma)
...@@ -154,7 +154,7 @@ void drm_free_buffer(struct drm_device *dev, struct drm_buf * buf) ...@@ -154,7 +154,7 @@ void drm_free_buffer(struct drm_device *dev, struct drm_buf * buf)
*/ */
void drm_core_reclaim_buffers(struct drm_device *dev, struct file *filp) void drm_core_reclaim_buffers(struct drm_device *dev, struct file *filp)
{ {
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
int i; int i;
if (!dma) if (!dma)
......
drivers/char/drm/drm_proc.c
View file @ cdd55a29
...@@ -287,7 +287,7 @@ static int drm__queues_info(char *buf, char **start, off_t offset, ...@@ -287,7 +287,7 @@ static int drm__queues_info(char *buf, char **start, off_t offset,
struct drm_device *dev = (struct drm_device *) data; struct drm_device *dev = (struct drm_device *) data;
int len = 0; int len = 0;
int i; int i;
drm_queue_t *q; struct drm_queue *q;
if (offset > DRM_PROC_LIMIT) { if (offset > DRM_PROC_LIMIT) {
*eof = 1; *eof = 1;
...@@ -359,7 +359,7 @@ static int drm__bufs_info(char *buf, char **start, off_t offset, int request, ...@@ -359,7 +359,7 @@ static int drm__bufs_info(char *buf, char **start, off_t offset, int request,
{ {
struct drm_device *dev = (struct drm_device *) data; struct drm_device *dev = (struct drm_device *) data;
int len = 0; int len = 0;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
int i; int i;
if (!dma || offset > DRM_PROC_LIMIT) { if (!dma || offset > DRM_PROC_LIMIT) {
......
drivers/char/drm/drm_vm.c
View file @ cdd55a29
...@@ -276,7 +276,7 @@ static __inline__ struct page *drm_do_vm_dma_nopage(struct vm_area_struct *vma, ...@@ -276,7 +276,7 @@ static __inline__ struct page *drm_do_vm_dma_nopage(struct vm_area_struct *vma,
{ {
struct drm_file *priv = vma->vm_file->private_data; struct drm_file *priv = vma->vm_file->private_data;
struct drm_device *dev = priv->head->dev; struct drm_device *dev = priv->head->dev;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
unsigned long offset; unsigned long offset;
unsigned long page_nr; unsigned long page_nr;
struct page *page; struct page *page;
...@@ -474,7 +474,7 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma) ...@@ -474,7 +474,7 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma)
{ {
struct drm_file *priv = filp->private_data; struct drm_file *priv = filp->private_data;
struct drm_device *dev; struct drm_device *dev;
drm_device_dma_t *dma; struct drm_device_dma *dma;
unsigned long length = vma->vm_end - vma->vm_start; unsigned long length = vma->vm_end - vma->vm_start;
dev = priv->head->dev; dev = priv->head->dev;
......
drivers/char/drm/i810_dma.c
View file @ cdd55a29
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
static struct drm_buf *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; struct drm_device_dma *dma = dev->dma;
int i; int i;
int used; int used;
...@@ -204,7 +204,7 @@ static int i810_dma_get_buffer(struct drm_device * dev, drm_i810_dma_t * d, ...@@ -204,7 +204,7 @@ static int i810_dma_get_buffer(struct drm_device * dev, drm_i810_dma_t * d,
static int i810_dma_cleanup(struct drm_device * dev) static int i810_dma_cleanup(struct drm_device * dev)
{ {
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
/* Make sure interrupts are disabled here because the uninstall ioctl /* Make sure interrupts are disabled here because the uninstall ioctl
* may not have been called from userspace and after dev_private * may not have been called from userspace and after dev_private
...@@ -290,7 +290,7 @@ static void i810_kernel_lost_context(struct drm_device * dev) ...@@ -290,7 +290,7 @@ static void i810_kernel_lost_context(struct drm_device * dev)
static int i810_freelist_init(struct drm_device * 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; struct drm_device_dma *dma = dev->dma;
int my_idx = 24; int my_idx = 24;
u32 *hw_status = (u32 *) (dev_priv->hw_status_page + my_idx); u32 *hw_status = (u32 *) (dev_priv->hw_status_page + my_idx);
int i; int i;
...@@ -936,7 +936,7 @@ static void i810_dma_quiescent(struct drm_device * dev) ...@@ -936,7 +936,7 @@ static void i810_dma_quiescent(struct drm_device * dev)
static int i810_flush_queue(struct drm_device * dev) static int i810_flush_queue(struct drm_device * dev)
{ {
drm_i810_private_t *dev_priv = dev->dev_private; drm_i810_private_t *dev_priv = dev->dev_private;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
int i, ret = 0; int i, ret = 0;
RING_LOCALS; RING_LOCALS;
...@@ -970,7 +970,7 @@ static int i810_flush_queue(struct drm_device * dev) ...@@ -970,7 +970,7 @@ static int i810_flush_queue(struct drm_device * dev)
/* Must be called with the lock held */ /* Must be called with the lock held */
static void i810_reclaim_buffers(struct drm_device * dev, struct file *filp) static void i810_reclaim_buffers(struct drm_device * dev, struct file *filp)
{ {
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
int i; int i;
if (!dma) if (!dma)
...@@ -1015,7 +1015,7 @@ static int i810_dma_vertex(struct inode *inode, struct file *filp, ...@@ -1015,7 +1015,7 @@ static int i810_dma_vertex(struct inode *inode, struct file *filp,
{ {
struct drm_file *priv = filp->private_data; struct drm_file *priv = filp->private_data;
struct drm_device *dev = priv->head->dev; struct drm_device *dev = priv->head->dev;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private; drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private;
u32 *hw_status = dev_priv->hw_status_page; u32 *hw_status = dev_priv->hw_status_page;
drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *) drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *)
...@@ -1207,7 +1207,7 @@ static int i810_dma_mc(struct inode *inode, struct file *filp, ...@@ -1207,7 +1207,7 @@ static int i810_dma_mc(struct inode *inode, struct file *filp,
{ {
struct drm_file *priv = filp->private_data; struct drm_file *priv = filp->private_data;
struct drm_device *dev = priv->head->dev; struct drm_device *dev = priv->head->dev;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private; drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private;
u32 *hw_status = dev_priv->hw_status_page; u32 *hw_status = dev_priv->hw_status_page;
drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *) drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *)
......
drivers/char/drm/i830_dma.c
View file @ cdd55a29
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
static struct drm_buf *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; struct drm_device_dma *dma = dev->dma;
int i; int i;
int used; int used;
...@@ -208,7 +208,7 @@ static int i830_dma_get_buffer(struct drm_device * dev, drm_i830_dma_t * d, ...@@ -208,7 +208,7 @@ static int i830_dma_get_buffer(struct drm_device * dev, drm_i830_dma_t * d,
static int i830_dma_cleanup(struct drm_device * dev) static int i830_dma_cleanup(struct drm_device * dev)
{ {
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
/* Make sure interrupts are disabled here because the uninstall ioctl /* Make sure interrupts are disabled here because the uninstall ioctl
* may not have been called from userspace and after dev_private * may not have been called from userspace and after dev_private
...@@ -298,7 +298,7 @@ static void i830_kernel_lost_context(struct drm_device * dev) ...@@ -298,7 +298,7 @@ static void i830_kernel_lost_context(struct drm_device * dev)
static int i830_freelist_init(struct drm_device * dev, drm_i830_private_t * dev_priv) static int i830_freelist_init(struct drm_device * dev, drm_i830_private_t * dev_priv)
{ {
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
int my_idx = 36; int my_idx = 36;
u32 *hw_status = (u32 *) (dev_priv->hw_status_page + my_idx); u32 *hw_status = (u32 *) (dev_priv->hw_status_page + my_idx);
int i; int i;
...@@ -1218,7 +1218,7 @@ static void i830_dma_quiescent(struct drm_device * dev) ...@@ -1218,7 +1218,7 @@ static void i830_dma_quiescent(struct drm_device * dev)
static int i830_flush_queue(struct drm_device * dev) static int i830_flush_queue(struct drm_device * dev)
{ {
drm_i830_private_t *dev_priv = dev->dev_private; drm_i830_private_t *dev_priv = dev->dev_private;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
int i, ret = 0; int i, ret = 0;
RING_LOCALS; RING_LOCALS;
...@@ -1250,7 +1250,7 @@ static int i830_flush_queue(struct drm_device * dev) ...@@ -1250,7 +1250,7 @@ static int i830_flush_queue(struct drm_device * dev)
/* Must be called with the lock held */ /* Must be called with the lock held */
static void i830_reclaim_buffers(struct drm_device * dev, struct file *filp) static void i830_reclaim_buffers(struct drm_device * dev, struct file *filp)
{ {
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
int i; int i;
if (!dma) if (!dma)
...@@ -1295,7 +1295,7 @@ static int i830_dma_vertex(struct inode *inode, struct file *filp, ...@@ -1295,7 +1295,7 @@ static int i830_dma_vertex(struct inode *inode, struct file *filp,
{ {
struct drm_file *priv = filp->private_data; struct drm_file *priv = filp->private_data;
struct drm_device *dev = priv->head->dev; struct drm_device *dev = priv->head->dev;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private; drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private;
u32 *hw_status = dev_priv->hw_status_page; u32 *hw_status = dev_priv->hw_status_page;
drm_i830_sarea_t *sarea_priv = (drm_i830_sarea_t *) drm_i830_sarea_t *sarea_priv = (drm_i830_sarea_t *)
......
drivers/char/drm/mga_dma.c
View file @ cdd55a29
...@@ -247,7 +247,7 @@ static void mga_freelist_print(struct drm_device * dev) ...@@ -247,7 +247,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) static int mga_freelist_init(struct drm_device * dev, drm_mga_private_t * dev_priv)
{ {
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_buf *buf; struct drm_buf *buf;
drm_mga_buf_priv_t *buf_priv; drm_mga_buf_priv_t *buf_priv;
drm_mga_freelist_t *entry; drm_mga_freelist_t *entry;
...@@ -313,7 +313,7 @@ static void mga_freelist_cleanup(struct drm_device * dev) ...@@ -313,7 +313,7 @@ static void mga_freelist_cleanup(struct drm_device * dev)
*/ */
static void mga_freelist_reset(struct drm_device * dev) static void mga_freelist_reset(struct drm_device * dev)
{ {
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_buf *buf; struct drm_buf *buf;
drm_mga_buf_priv_t *buf_priv; drm_mga_buf_priv_t *buf_priv;
int i; int i;
...@@ -1113,7 +1113,7 @@ static int mga_dma_get_buffers(DRMFILE filp, struct drm_device * dev, struct drm ...@@ -1113,7 +1113,7 @@ static int mga_dma_get_buffers(DRMFILE filp, struct drm_device * dev, struct drm
int mga_dma_buffers(DRM_IOCTL_ARGS) int mga_dma_buffers(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private; drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private;
struct drm_dma __user *argp = (void __user *)data; struct drm_dma __user *argp = (void __user *)data;
struct drm_dma d; struct drm_dma d;
......
drivers/char/drm/mga_state.c
View file @ cdd55a29
...@@ -880,7 +880,7 @@ static int mga_dma_vertex(DRM_IOCTL_ARGS) ...@@ -880,7 +880,7 @@ static int mga_dma_vertex(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_mga_private_t *dev_priv = dev->dev_private; drm_mga_private_t *dev_priv = dev->dev_private;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_buf *buf; struct drm_buf *buf;
drm_mga_buf_priv_t *buf_priv; drm_mga_buf_priv_t *buf_priv;
drm_mga_vertex_t vertex; drm_mga_vertex_t vertex;
...@@ -920,7 +920,7 @@ static int mga_dma_indices(DRM_IOCTL_ARGS) ...@@ -920,7 +920,7 @@ static int mga_dma_indices(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_mga_private_t *dev_priv = dev->dev_private; drm_mga_private_t *dev_priv = dev->dev_private;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_buf *buf; struct drm_buf *buf;
drm_mga_buf_priv_t *buf_priv; drm_mga_buf_priv_t *buf_priv;
drm_mga_indices_t indices; drm_mga_indices_t indices;
...@@ -959,7 +959,7 @@ static int mga_dma_indices(DRM_IOCTL_ARGS) ...@@ -959,7 +959,7 @@ static int mga_dma_indices(DRM_IOCTL_ARGS)
static int mga_dma_iload(DRM_IOCTL_ARGS) static int mga_dma_iload(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
drm_mga_private_t *dev_priv = dev->dev_private; drm_mga_private_t *dev_priv = dev->dev_private;
struct drm_buf *buf; struct drm_buf *buf;
drm_mga_buf_priv_t *buf_priv; drm_mga_buf_priv_t *buf_priv;
......
drivers/char/drm/r128_cce.c
View file @ cdd55a29
...@@ -771,7 +771,7 @@ int r128_fullscreen(DRM_IOCTL_ARGS) ...@@ -771,7 +771,7 @@ int r128_fullscreen(DRM_IOCTL_ARGS)
#if 0 #if 0
static int r128_freelist_init(struct drm_device * dev) static int r128_freelist_init(struct drm_device * dev)
{ {
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
drm_r128_private_t *dev_priv = dev->dev_private; drm_r128_private_t *dev_priv = dev->dev_private;
struct drm_buf *buf; struct drm_buf *buf;
drm_r128_buf_priv_t *buf_priv; drm_r128_buf_priv_t *buf_priv;
...@@ -817,7 +817,7 @@ static int r128_freelist_init(struct drm_device * dev) ...@@ -817,7 +817,7 @@ static int r128_freelist_init(struct drm_device * dev)
static struct drm_buf *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; struct drm_device_dma *dma = dev->dma;
drm_r128_private_t *dev_priv = dev->dev_private; drm_r128_private_t *dev_priv = dev->dev_private;
drm_r128_buf_priv_t *buf_priv; drm_r128_buf_priv_t *buf_priv;
struct drm_buf *buf; struct drm_buf *buf;
...@@ -855,7 +855,7 @@ static struct drm_buf *r128_freelist_get(struct drm_device * dev) ...@@ -855,7 +855,7 @@ static struct drm_buf *r128_freelist_get(struct drm_device * dev)
void r128_freelist_reset(struct drm_device * dev) void r128_freelist_reset(struct drm_device * dev)
{ {
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
int i; int i;
for (i = 0; i < dma->buf_count; i++) { for (i = 0; i < dma->buf_count; i++) {
...@@ -913,7 +913,7 @@ static int r128_cce_get_buffers(DRMFILE filp, struct drm_device * dev, struct dr ...@@ -913,7 +913,7 @@ static int r128_cce_get_buffers(DRMFILE filp, struct drm_device * dev, struct dr
int r128_cce_buffers(DRM_IOCTL_ARGS) int r128_cce_buffers(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
int ret = 0; int ret = 0;
struct drm_dma __user *argp = (void __user *)data; struct drm_dma __user *argp = (void __user *)data;
struct drm_dma d; struct drm_dma d;
......
drivers/char/drm/r128_state.c
View file @ cdd55a29
...@@ -780,7 +780,7 @@ static int r128_cce_dispatch_blit(DRMFILE filp, ...@@ -780,7 +780,7 @@ static int r128_cce_dispatch_blit(DRMFILE filp,
struct drm_device * dev, drm_r128_blit_t * blit) struct drm_device * dev, drm_r128_blit_t * blit)
{ {
drm_r128_private_t *dev_priv = dev->dev_private; drm_r128_private_t *dev_priv = dev->dev_private;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_buf *buf; struct drm_buf *buf;
drm_r128_buf_priv_t *buf_priv; drm_r128_buf_priv_t *buf_priv;
u32 *data; u32 *data;
...@@ -1354,7 +1354,7 @@ static int r128_cce_vertex(DRM_IOCTL_ARGS) ...@@ -1354,7 +1354,7 @@ static int r128_cce_vertex(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_r128_private_t *dev_priv = dev->dev_private; drm_r128_private_t *dev_priv = dev->dev_private;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_buf *buf; struct drm_buf *buf;
drm_r128_buf_priv_t *buf_priv; drm_r128_buf_priv_t *buf_priv;
drm_r128_vertex_t vertex; drm_r128_vertex_t vertex;
...@@ -1413,7 +1413,7 @@ static int r128_cce_indices(DRM_IOCTL_ARGS) ...@@ -1413,7 +1413,7 @@ static int r128_cce_indices(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_r128_private_t *dev_priv = dev->dev_private; drm_r128_private_t *dev_priv = dev->dev_private;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_buf *buf; struct drm_buf *buf;
drm_r128_buf_priv_t *buf_priv; drm_r128_buf_priv_t *buf_priv;
drm_r128_indices_t elts; drm_r128_indices_t elts;
...@@ -1483,7 +1483,7 @@ static int r128_cce_indices(DRM_IOCTL_ARGS) ...@@ -1483,7 +1483,7 @@ static int r128_cce_indices(DRM_IOCTL_ARGS)
static int r128_cce_blit(DRM_IOCTL_ARGS) static int r128_cce_blit(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
drm_r128_private_t *dev_priv = dev->dev_private; drm_r128_private_t *dev_priv = dev->dev_private;
drm_r128_blit_t blit; drm_r128_blit_t blit;
int ret; int ret;
...@@ -1571,7 +1571,7 @@ static int r128_cce_indirect(DRM_IOCTL_ARGS) ...@@ -1571,7 +1571,7 @@ static int r128_cce_indirect(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_r128_private_t *dev_priv = dev->dev_private; drm_r128_private_t *dev_priv = dev->dev_private;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_buf *buf; struct drm_buf *buf;
drm_r128_buf_priv_t *buf_priv; drm_r128_buf_priv_t *buf_priv;
drm_r128_indirect_t indirect; drm_r128_indirect_t indirect;
......
drivers/char/drm/r300_cmdbuf.c
View file @ cdd55a29
...@@ -785,7 +785,7 @@ int r300_do_cp_cmdbuf(struct drm_device *dev, ...@@ -785,7 +785,7 @@ int r300_do_cp_cmdbuf(struct drm_device *dev,
drm_radeon_kcmd_buffer_t *cmdbuf) drm_radeon_kcmd_buffer_t *cmdbuf)
{ {
drm_radeon_private_t *dev_priv = dev->dev_private; drm_radeon_private_t *dev_priv = dev->dev_private;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_buf *buf = NULL; struct drm_buf *buf = NULL;
int emit_dispatch_age = 0; int emit_dispatch_age = 0;
int ret = 0; int ret = 0;
......
drivers/char/drm/radeon_cp.c
View file @ cdd55a29
...@@ -2048,7 +2048,7 @@ int radeon_fullscreen(DRM_IOCTL_ARGS) ...@@ -2048,7 +2048,7 @@ int radeon_fullscreen(DRM_IOCTL_ARGS)
struct drm_buf *radeon_freelist_get(struct drm_device * dev) struct drm_buf *radeon_freelist_get(struct drm_device * dev)
{ {
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
drm_radeon_private_t *dev_priv = dev->dev_private; drm_radeon_private_t *dev_priv = dev->dev_private;
drm_radeon_buf_priv_t *buf_priv; drm_radeon_buf_priv_t *buf_priv;
struct drm_buf *buf; struct drm_buf *buf;
...@@ -2088,7 +2088,7 @@ struct drm_buf *radeon_freelist_get(struct drm_device * dev) ...@@ -2088,7 +2088,7 @@ struct drm_buf *radeon_freelist_get(struct drm_device * dev)
#if 0 #if 0
struct drm_buf *radeon_freelist_get(struct drm_device * dev) struct drm_buf *radeon_freelist_get(struct drm_device * dev)
{ {
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
drm_radeon_private_t *dev_priv = dev->dev_private; drm_radeon_private_t *dev_priv = dev->dev_private;
drm_radeon_buf_priv_t *buf_priv; drm_radeon_buf_priv_t *buf_priv;
struct drm_buf *buf; struct drm_buf *buf;
...@@ -2122,7 +2122,7 @@ struct drm_buf *radeon_freelist_get(struct drm_device * dev) ...@@ -2122,7 +2122,7 @@ struct drm_buf *radeon_freelist_get(struct drm_device * dev)
void radeon_freelist_reset(struct drm_device * dev) void radeon_freelist_reset(struct drm_device * dev)
{ {
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
drm_radeon_private_t *dev_priv = dev->dev_private; drm_radeon_private_t *dev_priv = dev->dev_private;
int i; int i;
...@@ -2198,7 +2198,7 @@ static int radeon_cp_get_buffers(DRMFILE filp, struct drm_device * dev, ...@@ -2198,7 +2198,7 @@ static int radeon_cp_get_buffers(DRMFILE filp, struct drm_device * dev,
int radeon_cp_buffers(DRM_IOCTL_ARGS) int radeon_cp_buffers(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
int ret = 0; int ret = 0;
struct drm_dma __user *argp = (void __user *)data; struct drm_dma __user *argp = (void __user *)data;
struct drm_dma d; struct drm_dma d;
......
drivers/char/drm/radeon_state.c
View file @ cdd55a29
...@@ -2208,7 +2208,7 @@ static int radeon_cp_vertex(DRM_IOCTL_ARGS) ...@@ -2208,7 +2208,7 @@ static int radeon_cp_vertex(DRM_IOCTL_ARGS)
drm_radeon_private_t *dev_priv = dev->dev_private; drm_radeon_private_t *dev_priv = dev->dev_private;
struct drm_file *filp_priv; struct drm_file *filp_priv;
drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_buf *buf; struct drm_buf *buf;
drm_radeon_vertex_t vertex; drm_radeon_vertex_t vertex;
drm_radeon_tcl_prim_t prim; drm_radeon_tcl_prim_t prim;
...@@ -2291,7 +2291,7 @@ static int radeon_cp_indices(DRM_IOCTL_ARGS) ...@@ -2291,7 +2291,7 @@ static int radeon_cp_indices(DRM_IOCTL_ARGS)
drm_radeon_private_t *dev_priv = dev->dev_private; drm_radeon_private_t *dev_priv = dev->dev_private;
struct drm_file *filp_priv; struct drm_file *filp_priv;
drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_buf *buf; struct drm_buf *buf;
drm_radeon_indices_t elts; drm_radeon_indices_t elts;
drm_radeon_tcl_prim_t prim; drm_radeon_tcl_prim_t prim;
...@@ -2438,7 +2438,7 @@ static int radeon_cp_indirect(DRM_IOCTL_ARGS) ...@@ -2438,7 +2438,7 @@ static int radeon_cp_indirect(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_radeon_private_t *dev_priv = dev->dev_private; drm_radeon_private_t *dev_priv = dev->dev_private;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_buf *buf; struct drm_buf *buf;
drm_radeon_indirect_t indirect; drm_radeon_indirect_t indirect;
RING_LOCALS; RING_LOCALS;
...@@ -2509,7 +2509,7 @@ static int radeon_cp_vertex2(DRM_IOCTL_ARGS) ...@@ -2509,7 +2509,7 @@ static int radeon_cp_vertex2(DRM_IOCTL_ARGS)
drm_radeon_private_t *dev_priv = dev->dev_private; drm_radeon_private_t *dev_priv = dev->dev_private;
struct drm_file *filp_priv; struct drm_file *filp_priv;
drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_buf *buf; struct drm_buf *buf;
drm_radeon_vertex2_t vertex; drm_radeon_vertex2_t vertex;
int i; int i;
...@@ -2850,7 +2850,7 @@ static int radeon_cp_cmdbuf(DRM_IOCTL_ARGS) ...@@ -2850,7 +2850,7 @@ static int radeon_cp_cmdbuf(DRM_IOCTL_ARGS)
DRM_DEVICE; DRM_DEVICE;
drm_radeon_private_t *dev_priv = dev->dev_private; drm_radeon_private_t *dev_priv = dev->dev_private;
struct drm_file *filp_priv; struct drm_file *filp_priv;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_buf *buf = NULL; struct drm_buf *buf = NULL;
int idx; int idx;
drm_radeon_kcmd_buffer_t cmdbuf; drm_radeon_kcmd_buffer_t cmdbuf;
......
drivers/char/drm/savage_bci.c
View file @ cdd55a29
...@@ -206,7 +206,7 @@ uint16_t savage_bci_emit_event(drm_savage_private_t * dev_priv, ...@@ -206,7 +206,7 @@ uint16_t savage_bci_emit_event(drm_savage_private_t * dev_priv,
static int savage_freelist_init(struct drm_device * dev) static int savage_freelist_init(struct drm_device * dev)
{ {
drm_savage_private_t *dev_priv = dev->dev_private; drm_savage_private_t *dev_priv = dev->dev_private;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_buf *buf; struct drm_buf *buf;
drm_savage_buf_priv_t *entry; drm_savage_buf_priv_t *entry;
int i; int i;
...@@ -1034,7 +1034,7 @@ static int savage_bci_get_buffers(DRMFILE filp, struct drm_device *dev, struct d ...@@ -1034,7 +1034,7 @@ static int savage_bci_get_buffers(DRMFILE filp, struct drm_device *dev, struct d
int savage_bci_buffers(DRM_IOCTL_ARGS) int savage_bci_buffers(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_dma d; struct drm_dma d;
int ret = 0; int ret = 0;
...@@ -1071,7 +1071,7 @@ int savage_bci_buffers(DRM_IOCTL_ARGS) ...@@ -1071,7 +1071,7 @@ int savage_bci_buffers(DRM_IOCTL_ARGS)
void savage_reclaim_buffers(struct drm_device *dev, DRMFILE filp) void savage_reclaim_buffers(struct drm_device *dev, DRMFILE filp)
{ {
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
drm_savage_private_t *dev_priv = dev->dev_private; drm_savage_private_t *dev_priv = dev->dev_private;
int i; int i;
......
drivers/char/drm/savage_state.c
View file @ cdd55a29
...@@ -957,7 +957,7 @@ int savage_bci_cmdbuf(DRM_IOCTL_ARGS) ...@@ -957,7 +957,7 @@ int savage_bci_cmdbuf(DRM_IOCTL_ARGS)
{ {
DRM_DEVICE; DRM_DEVICE;
drm_savage_private_t *dev_priv = dev->dev_private; drm_savage_private_t *dev_priv = dev->dev_private;
drm_device_dma_t *dma = dev->dma; struct drm_device_dma *dma = dev->dma;
struct drm_buf *dmabuf; struct drm_buf *dmabuf;
drm_savage_cmdbuf_t cmdbuf; drm_savage_cmdbuf_t cmdbuf;
drm_savage_cmd_header_t *kcmd_addr = NULL; drm_savage_cmd_header_t *kcmd_addr = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7