diff options
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/drm/drmP.h | 32 | ||||
-rw-r--r-- | drivers/char/drm/drm_bufs.c | 33 | ||||
-rw-r--r-- | drivers/char/drm/drm_dma.c | 4 | ||||
-rw-r--r-- | drivers/char/drm/drm_proc.c | 4 | ||||
-rw-r--r-- | drivers/char/drm/drm_vm.c | 4 | ||||
-rw-r--r-- | drivers/char/drm/i810_dma.c | 14 | ||||
-rw-r--r-- | drivers/char/drm/i830_dma.c | 12 | ||||
-rw-r--r-- | drivers/char/drm/mga_dma.c | 6 | ||||
-rw-r--r-- | drivers/char/drm/mga_state.c | 6 | ||||
-rw-r--r-- | drivers/char/drm/r128_cce.c | 8 | ||||
-rw-r--r-- | drivers/char/drm/r128_state.c | 10 | ||||
-rw-r--r-- | drivers/char/drm/r300_cmdbuf.c | 2 | ||||
-rw-r--r-- | drivers/char/drm/radeon_cp.c | 8 | ||||
-rw-r--r-- | drivers/char/drm/radeon_state.c | 10 | ||||
-rw-r--r-- | drivers/char/drm/savage_bci.c | 6 | ||||
-rw-r--r-- | drivers/char/drm/savage_state.c | 2 |
16 files changed, 81 insertions, 80 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index 288952837006..6cc848a83d54 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h | |||
@@ -319,7 +319,7 @@ struct drm_buf { | |||
319 | }; | 319 | }; |
320 | 320 | ||
321 | /** bufs is one longer than it has to be */ | 321 | /** bufs is one longer than it has to be */ |
322 | typedef struct drm_waitlist { | 322 | struct drm_waitlist { |
323 | int count; /**< Number of possible buffers */ | 323 | int count; /**< Number of possible buffers */ |
324 | struct drm_buf **bufs; /**< List of pointers to buffers */ | 324 | struct drm_buf **bufs; /**< List of pointers to buffers */ |
325 | struct drm_buf **rp; /**< Read pointer */ | 325 | struct drm_buf **rp; /**< Read pointer */ |
@@ -327,9 +327,9 @@ typedef struct drm_waitlist { | |||
327 | struct drm_buf **end; /**< End pointer */ | 327 | struct drm_buf **end; /**< End pointer */ |
328 | spinlock_t read_lock; | 328 | spinlock_t read_lock; |
329 | spinlock_t write_lock; | 329 | spinlock_t write_lock; |
330 | } drm_waitlist_t; | 330 | }; |
331 | 331 | ||
332 | typedef struct drm_freelist { | 332 | struct drm_freelist { |
333 | int initialized; /**< Freelist in use */ | 333 | int initialized; /**< Freelist in use */ |
334 | atomic_t count; /**< Number of free buffers */ | 334 | atomic_t count; /**< Number of free buffers */ |
335 | struct drm_buf *next; /**< End pointer */ | 335 | struct drm_buf *next; /**< End pointer */ |
@@ -339,7 +339,7 @@ typedef struct drm_freelist { | |||
339 | int high_mark; /**< High water mark */ | 339 | int high_mark; /**< High water mark */ |
340 | atomic_t wfh; /**< If waiting for high mark */ | 340 | atomic_t wfh; /**< If waiting for high mark */ |
341 | spinlock_t lock; | 341 | spinlock_t lock; |
342 | } drm_freelist_t; | 342 | }; |
343 | 343 | ||
344 | typedef struct drm_dma_handle { | 344 | typedef struct drm_dma_handle { |
345 | dma_addr_t busaddr; | 345 | dma_addr_t busaddr; |
@@ -350,16 +350,16 @@ typedef struct drm_dma_handle { | |||
350 | /** | 350 | /** |
351 | * Buffer entry. There is one of this for each buffer size order. | 351 | * Buffer entry. There is one of this for each buffer size order. |
352 | */ | 352 | */ |
353 | typedef struct drm_buf_entry { | 353 | struct drm_buf_entry { |
354 | int buf_size; /**< size */ | 354 | int buf_size; /**< size */ |
355 | int buf_count; /**< number of buffers */ | 355 | int buf_count; /**< number of buffers */ |
356 | struct drm_buf *buflist; /**< buffer list */ | 356 | struct drm_buf *buflist; /**< buffer list */ |
357 | int seg_count; | 357 | int seg_count; |
358 | int page_order; | 358 | int page_order; |
359 | drm_dma_handle_t **seglist; | 359 | struct drm_dma_handle **seglist; |
360 | 360 | ||
361 | drm_freelist_t freelist; | 361 | struct drm_freelist freelist; |
362 | } drm_buf_entry_t; | 362 | }; |
363 | 363 | ||
364 | /** File private data */ | 364 | /** File private data */ |
365 | struct drm_file { | 365 | struct drm_file { |
@@ -378,7 +378,7 @@ struct drm_file { | |||
378 | }; | 378 | }; |
379 | 379 | ||
380 | /** Wait queue */ | 380 | /** Wait queue */ |
381 | typedef struct drm_queue { | 381 | struct drm_queue { |
382 | atomic_t use_count; /**< Outstanding uses (+1) */ | 382 | atomic_t use_count; /**< Outstanding uses (+1) */ |
383 | atomic_t finalization; /**< Finalization in progress */ | 383 | atomic_t finalization; /**< Finalization in progress */ |
384 | atomic_t block_count; /**< Count of processes waiting */ | 384 | atomic_t block_count; /**< Count of processes waiting */ |
@@ -392,9 +392,9 @@ typedef struct drm_queue { | |||
392 | atomic_t total_locks; /**< Total locks statistics */ | 392 | atomic_t total_locks; /**< Total locks statistics */ |
393 | #endif | 393 | #endif |
394 | enum drm_ctx_flags flags; /**< Context preserving and 2D-only */ | 394 | enum drm_ctx_flags flags; /**< Context preserving and 2D-only */ |
395 | drm_waitlist_t waitlist; /**< Pending buffers */ | 395 | struct drm_waitlist waitlist; /**< Pending buffers */ |
396 | wait_queue_head_t flush_queue; /**< Processes waiting until flush */ | 396 | wait_queue_head_t flush_queue; /**< Processes waiting until flush */ |
397 | } drm_queue_t; | 397 | }; |
398 | 398 | ||
399 | /** | 399 | /** |
400 | * Lock data. | 400 | * Lock data. |
@@ -413,9 +413,9 @@ typedef struct drm_lock_data { | |||
413 | /** | 413 | /** |
414 | * DMA data. | 414 | * DMA data. |
415 | */ | 415 | */ |
416 | typedef struct drm_device_dma { | 416 | struct drm_device_dma { |
417 | 417 | ||
418 | drm_buf_entry_t bufs[DRM_MAX_ORDER + 1]; /**< buffers, grouped by their size order */ | 418 | struct drm_buf_entry bufs[DRM_MAX_ORDER + 1]; /**< buffers, grouped by their size order */ |
419 | int buf_count; /**< total number of buffers */ | 419 | int buf_count; /**< total number of buffers */ |
420 | struct drm_buf **buflist; /**< Vector of pointers into drm_device_dma::bufs */ | 420 | struct drm_buf **buflist; /**< Vector of pointers into drm_device_dma::bufs */ |
421 | int seg_count; | 421 | int seg_count; |
@@ -429,7 +429,7 @@ typedef struct drm_device_dma { | |||
429 | _DRM_DMA_USE_PCI_RO = 0x08 | 429 | _DRM_DMA_USE_PCI_RO = 0x08 |
430 | } flags; | 430 | } flags; |
431 | 431 | ||
432 | } drm_device_dma_t; | 432 | }; |
433 | 433 | ||
434 | /** | 434 | /** |
435 | * AGP memory entry. Stored as a doubly linked list. | 435 | * AGP memory entry. Stored as a doubly linked list. |
@@ -688,8 +688,8 @@ struct drm_device { | |||
688 | int queue_count; /**< Number of active DMA queues */ | 688 | int queue_count; /**< Number of active DMA queues */ |
689 | int queue_reserved; /**< Number of reserved DMA queues */ | 689 | int queue_reserved; /**< Number of reserved DMA queues */ |
690 | int queue_slots; /**< Actual length of queuelist */ | 690 | int queue_slots; /**< Actual length of queuelist */ |
691 | drm_queue_t **queuelist; /**< Vector of pointers to DMA queues */ | 691 | struct drm_queue **queuelist; /**< Vector of pointers to DMA queues */ |
692 | drm_device_dma_t *dma; /**< Optional pointer for DMA support */ | 692 | struct drm_device_dma *dma; /**< Optional pointer for DMA support */ |
693 | /*@} */ | 693 | /*@} */ |
694 | 694 | ||
695 | /** \name Context support */ | 695 | /** \name Context support */ |
diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c index bdd301519769..3528453c8ece 100644 --- a/drivers/char/drm/drm_bufs.c +++ b/drivers/char/drm/drm_bufs.c | |||
@@ -504,7 +504,8 @@ int drm_rmmap_ioctl(struct inode *inode, struct file *filp, | |||
504 | * | 504 | * |
505 | * Frees any pages and buffers associated with the given entry. | 505 | * Frees any pages and buffers associated with the given entry. |
506 | */ | 506 | */ |
507 | static void drm_cleanup_buf_error(struct drm_device * dev, drm_buf_entry_t * entry) | 507 | static void drm_cleanup_buf_error(struct drm_device * dev, |
508 | struct drm_buf_entry * entry) | ||
508 | { | 509 | { |
509 | int i; | 510 | int i; |
510 | 511 | ||
@@ -551,8 +552,8 @@ static void drm_cleanup_buf_error(struct drm_device * dev, drm_buf_entry_t * ent | |||
551 | */ | 552 | */ |
552 | int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) | 553 | int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) |
553 | { | 554 | { |
554 | drm_device_dma_t *dma = dev->dma; | 555 | struct drm_device_dma *dma = dev->dma; |
555 | drm_buf_entry_t *entry; | 556 | struct drm_buf_entry *entry; |
556 | drm_agp_mem_t *agp_entry; | 557 | drm_agp_mem_t *agp_entry; |
557 | struct drm_buf *buf; | 558 | struct drm_buf *buf; |
558 | unsigned long offset; | 559 | unsigned long offset; |
@@ -721,13 +722,13 @@ EXPORT_SYMBOL(drm_addbufs_agp); | |||
721 | 722 | ||
722 | int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) | 723 | int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) |
723 | { | 724 | { |
724 | drm_device_dma_t *dma = dev->dma; | 725 | struct drm_device_dma *dma = dev->dma; |
725 | int count; | 726 | int count; |
726 | int order; | 727 | int order; |
727 | int size; | 728 | int size; |
728 | int total; | 729 | int total; |
729 | int page_order; | 730 | int page_order; |
730 | drm_buf_entry_t *entry; | 731 | struct drm_buf_entry *entry; |
731 | drm_dma_handle_t *dmah; | 732 | drm_dma_handle_t *dmah; |
732 | struct drm_buf *buf; | 733 | struct drm_buf *buf; |
733 | int alignment; | 734 | int alignment; |
@@ -947,8 +948,8 @@ EXPORT_SYMBOL(drm_addbufs_pci); | |||
947 | 948 | ||
948 | static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request) | 949 | static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request) |
949 | { | 950 | { |
950 | drm_device_dma_t *dma = dev->dma; | 951 | struct drm_device_dma *dma = dev->dma; |
951 | drm_buf_entry_t *entry; | 952 | struct drm_buf_entry *entry; |
952 | struct drm_buf *buf; | 953 | struct drm_buf *buf; |
953 | unsigned long offset; | 954 | unsigned long offset; |
954 | unsigned long agp_offset; | 955 | unsigned long agp_offset; |
@@ -1109,8 +1110,8 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request | |||
1109 | 1110 | ||
1110 | static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request) | 1111 | static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request) |
1111 | { | 1112 | { |
1112 | drm_device_dma_t *dma = dev->dma; | 1113 | struct drm_device_dma *dma = dev->dma; |
1113 | drm_buf_entry_t *entry; | 1114 | struct drm_buf_entry *entry; |
1114 | struct drm_buf *buf; | 1115 | struct drm_buf *buf; |
1115 | unsigned long offset; | 1116 | unsigned long offset; |
1116 | unsigned long agp_offset; | 1117 | unsigned long agp_offset; |
@@ -1339,7 +1340,7 @@ int drm_infobufs(struct inode *inode, struct file *filp, | |||
1339 | { | 1340 | { |
1340 | struct drm_file *priv = filp->private_data; | 1341 | struct drm_file *priv = filp->private_data; |
1341 | struct drm_device *dev = priv->head->dev; | 1342 | struct drm_device *dev = priv->head->dev; |
1342 | drm_device_dma_t *dma = dev->dma; | 1343 | struct drm_device_dma *dma = dev->dma; |
1343 | struct drm_buf_info request; | 1344 | struct drm_buf_info request; |
1344 | struct drm_buf_info __user *argp = (void __user *)arg; | 1345 | struct drm_buf_info __user *argp = (void __user *)arg; |
1345 | int i; | 1346 | int i; |
@@ -1374,8 +1375,8 @@ int drm_infobufs(struct inode *inode, struct file *filp, | |||
1374 | if (dma->bufs[i].buf_count) { | 1375 | if (dma->bufs[i].buf_count) { |
1375 | struct drm_buf_desc __user *to = | 1376 | struct drm_buf_desc __user *to = |
1376 | &request.list[count]; | 1377 | &request.list[count]; |
1377 | drm_buf_entry_t *from = &dma->bufs[i]; | 1378 | struct drm_buf_entry *from = &dma->bufs[i]; |
1378 | drm_freelist_t *list = &dma->bufs[i].freelist; | 1379 | struct drm_freelist *list = &dma->bufs[i].freelist; |
1379 | if (copy_to_user(&to->count, | 1380 | if (copy_to_user(&to->count, |
1380 | &from->buf_count, | 1381 | &from->buf_count, |
1381 | sizeof(from->buf_count)) || | 1382 | sizeof(from->buf_count)) || |
@@ -1427,10 +1428,10 @@ int drm_markbufs(struct inode *inode, struct file *filp, | |||
1427 | { | 1428 | { |
1428 | struct drm_file *priv = filp->private_data; | 1429 | struct drm_file *priv = filp->private_data; |
1429 | struct drm_device *dev = priv->head->dev; | 1430 | struct drm_device *dev = priv->head->dev; |
1430 | drm_device_dma_t *dma = dev->dma; | 1431 | struct drm_device_dma *dma = dev->dma; |
1431 | struct drm_buf_desc request; | 1432 | struct drm_buf_desc request; |
1432 | int order; | 1433 | int order; |
1433 | drm_buf_entry_t *entry; | 1434 | struct drm_buf_entry *entry; |
1434 | 1435 | ||
1435 | if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA)) | 1436 | if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA)) |
1436 | return -EINVAL; | 1437 | return -EINVAL; |
@@ -1477,7 +1478,7 @@ int drm_freebufs(struct inode *inode, struct file *filp, | |||
1477 | { | 1478 | { |
1478 | struct drm_file *priv = filp->private_data; | 1479 | struct drm_file *priv = filp->private_data; |
1479 | struct drm_device *dev = priv->head->dev; | 1480 | struct drm_device *dev = priv->head->dev; |
1480 | drm_device_dma_t *dma = dev->dma; | 1481 | struct drm_device_dma *dma = dev->dma; |
1481 | struct drm_buf_free request; | 1482 | struct drm_buf_free request; |
1482 | int i; | 1483 | int i; |
1483 | int idx; | 1484 | int idx; |
@@ -1533,7 +1534,7 @@ int drm_mapbufs(struct inode *inode, struct file *filp, | |||
1533 | { | 1534 | { |
1534 | struct drm_file *priv = filp->private_data; | 1535 | struct drm_file *priv = filp->private_data; |
1535 | struct drm_device *dev = priv->head->dev; | 1536 | struct drm_device *dev = priv->head->dev; |
1536 | drm_device_dma_t *dma = dev->dma; | 1537 | struct drm_device_dma *dma = dev->dma; |
1537 | struct drm_buf_map __user *argp = (void __user *)arg; | 1538 | struct drm_buf_map __user *argp = (void __user *)arg; |
1538 | int retcode = 0; | 1539 | int retcode = 0; |
1539 | const int zero = 0; | 1540 | const int zero = 0; |
diff --git a/drivers/char/drm/drm_dma.c b/drivers/char/drm/drm_dma.c index 739a6a7a95d0..802fbdbfe1b3 100644 --- a/drivers/char/drm/drm_dma.c +++ b/drivers/char/drm/drm_dma.c | |||
@@ -69,7 +69,7 @@ int drm_dma_setup(struct drm_device *dev) | |||
69 | */ | 69 | */ |
70 | void drm_dma_takedown(struct drm_device *dev) | 70 | void drm_dma_takedown(struct drm_device *dev) |
71 | { | 71 | { |
72 | drm_device_dma_t *dma = dev->dma; | 72 | struct drm_device_dma *dma = dev->dma; |
73 | int i, j; | 73 | int i, j; |
74 | 74 | ||
75 | if (!dma) | 75 | if (!dma) |
@@ -154,7 +154,7 @@ void drm_free_buffer(struct drm_device *dev, struct drm_buf * buf) | |||
154 | */ | 154 | */ |
155 | void drm_core_reclaim_buffers(struct drm_device *dev, struct file *filp) | 155 | void drm_core_reclaim_buffers(struct drm_device *dev, struct file *filp) |
156 | { | 156 | { |
157 | drm_device_dma_t *dma = dev->dma; | 157 | struct drm_device_dma *dma = dev->dma; |
158 | int i; | 158 | int i; |
159 | 159 | ||
160 | if (!dma) | 160 | if (!dma) |
diff --git a/drivers/char/drm/drm_proc.c b/drivers/char/drm/drm_proc.c index 4e234a2134ad..86dd30a519c0 100644 --- a/drivers/char/drm/drm_proc.c +++ b/drivers/char/drm/drm_proc.c | |||
@@ -287,7 +287,7 @@ static int drm__queues_info(char *buf, char **start, off_t offset, | |||
287 | struct drm_device *dev = (struct drm_device *) data; | 287 | struct drm_device *dev = (struct drm_device *) data; |
288 | int len = 0; | 288 | int len = 0; |
289 | int i; | 289 | int i; |
290 | drm_queue_t *q; | 290 | struct drm_queue *q; |
291 | 291 | ||
292 | if (offset > DRM_PROC_LIMIT) { | 292 | if (offset > DRM_PROC_LIMIT) { |
293 | *eof = 1; | 293 | *eof = 1; |
@@ -359,7 +359,7 @@ static int drm__bufs_info(char *buf, char **start, off_t offset, int request, | |||
359 | { | 359 | { |
360 | struct drm_device *dev = (struct drm_device *) data; | 360 | struct drm_device *dev = (struct drm_device *) data; |
361 | int len = 0; | 361 | int len = 0; |
362 | drm_device_dma_t *dma = dev->dma; | 362 | struct drm_device_dma *dma = dev->dma; |
363 | int i; | 363 | int i; |
364 | 364 | ||
365 | if (!dma || offset > DRM_PROC_LIMIT) { | 365 | if (!dma || offset > DRM_PROC_LIMIT) { |
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c index 25f3bd11212f..95f9fe5daab7 100644 --- a/drivers/char/drm/drm_vm.c +++ b/drivers/char/drm/drm_vm.c | |||
@@ -276,7 +276,7 @@ static __inline__ struct page *drm_do_vm_dma_nopage(struct vm_area_struct *vma, | |||
276 | { | 276 | { |
277 | struct drm_file *priv = vma->vm_file->private_data; | 277 | struct drm_file *priv = vma->vm_file->private_data; |
278 | struct drm_device *dev = priv->head->dev; | 278 | struct drm_device *dev = priv->head->dev; |
279 | drm_device_dma_t *dma = dev->dma; | 279 | struct drm_device_dma *dma = dev->dma; |
280 | unsigned long offset; | 280 | unsigned long offset; |
281 | unsigned long page_nr; | 281 | unsigned long page_nr; |
282 | struct page *page; | 282 | struct page *page; |
@@ -474,7 +474,7 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma) | |||
474 | { | 474 | { |
475 | struct drm_file *priv = filp->private_data; | 475 | struct drm_file *priv = filp->private_data; |
476 | struct drm_device *dev; | 476 | struct drm_device *dev; |
477 | drm_device_dma_t *dma; | 477 | struct drm_device_dma *dma; |
478 | unsigned long length = vma->vm_end - vma->vm_start; | 478 | unsigned long length = vma->vm_end - vma->vm_start; |
479 | 479 | ||
480 | dev = priv->head->dev; | 480 | dev = priv->head->dev; |
diff --git a/drivers/char/drm/i810_dma.c b/drivers/char/drm/i810_dma.c index b4a98fa2e2d4..4d23bd0f8711 100644 --- a/drivers/char/drm/i810_dma.c +++ b/drivers/char/drm/i810_dma.c | |||
@@ -47,7 +47,7 @@ | |||
47 | 47 | ||
48 | static struct drm_buf *i810_freelist_get(struct drm_device * dev) | 48 | static struct drm_buf *i810_freelist_get(struct drm_device * dev) |
49 | { | 49 | { |
50 | drm_device_dma_t *dma = dev->dma; | 50 | struct drm_device_dma *dma = dev->dma; |
51 | int i; | 51 | int i; |
52 | int used; | 52 | int used; |
53 | 53 | ||
@@ -204,7 +204,7 @@ static int i810_dma_get_buffer(struct drm_device * dev, drm_i810_dma_t * d, | |||
204 | 204 | ||
205 | static int i810_dma_cleanup(struct drm_device * dev) | 205 | static int i810_dma_cleanup(struct drm_device * dev) |
206 | { | 206 | { |
207 | drm_device_dma_t *dma = dev->dma; | 207 | struct drm_device_dma *dma = dev->dma; |
208 | 208 | ||
209 | /* Make sure interrupts are disabled here because the uninstall ioctl | 209 | /* Make sure interrupts are disabled here because the uninstall ioctl |
210 | * may not have been called from userspace and after dev_private | 210 | * 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 | 290 | ||
291 | static int i810_freelist_init(struct drm_device * dev, drm_i810_private_t * dev_priv) | 291 | static int i810_freelist_init(struct drm_device * dev, drm_i810_private_t * dev_priv) |
292 | { | 292 | { |
293 | drm_device_dma_t *dma = dev->dma; | 293 | struct drm_device_dma *dma = dev->dma; |
294 | int my_idx = 24; | 294 | int my_idx = 24; |
295 | u32 *hw_status = (u32 *) (dev_priv->hw_status_page + my_idx); | 295 | u32 *hw_status = (u32 *) (dev_priv->hw_status_page + my_idx); |
296 | int i; | 296 | int i; |
@@ -936,7 +936,7 @@ static void i810_dma_quiescent(struct drm_device * dev) | |||
936 | static int i810_flush_queue(struct drm_device * dev) | 936 | static int i810_flush_queue(struct drm_device * dev) |
937 | { | 937 | { |
938 | drm_i810_private_t *dev_priv = dev->dev_private; | 938 | drm_i810_private_t *dev_priv = dev->dev_private; |
939 | drm_device_dma_t *dma = dev->dma; | 939 | struct drm_device_dma *dma = dev->dma; |
940 | int i, ret = 0; | 940 | int i, ret = 0; |
941 | RING_LOCALS; | 941 | RING_LOCALS; |
942 | 942 | ||
@@ -970,7 +970,7 @@ static int i810_flush_queue(struct drm_device * dev) | |||
970 | /* Must be called with the lock held */ | 970 | /* Must be called with the lock held */ |
971 | static void i810_reclaim_buffers(struct drm_device * dev, struct file *filp) | 971 | static void i810_reclaim_buffers(struct drm_device * dev, struct file *filp) |
972 | { | 972 | { |
973 | drm_device_dma_t *dma = dev->dma; | 973 | struct drm_device_dma *dma = dev->dma; |
974 | int i; | 974 | int i; |
975 | 975 | ||
976 | if (!dma) | 976 | if (!dma) |
@@ -1015,7 +1015,7 @@ static int i810_dma_vertex(struct inode *inode, struct file *filp, | |||
1015 | { | 1015 | { |
1016 | struct drm_file *priv = filp->private_data; | 1016 | struct drm_file *priv = filp->private_data; |
1017 | struct drm_device *dev = priv->head->dev; | 1017 | struct drm_device *dev = priv->head->dev; |
1018 | drm_device_dma_t *dma = dev->dma; | 1018 | struct drm_device_dma *dma = dev->dma; |
1019 | drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private; | 1019 | drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private; |
1020 | u32 *hw_status = dev_priv->hw_status_page; | 1020 | u32 *hw_status = dev_priv->hw_status_page; |
1021 | drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *) | 1021 | 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 | { | 1207 | { |
1208 | struct drm_file *priv = filp->private_data; | 1208 | struct drm_file *priv = filp->private_data; |
1209 | struct drm_device *dev = priv->head->dev; | 1209 | struct drm_device *dev = priv->head->dev; |
1210 | drm_device_dma_t *dma = dev->dma; | 1210 | struct drm_device_dma *dma = dev->dma; |
1211 | drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private; | 1211 | drm_i810_private_t *dev_priv = (drm_i810_private_t *) dev->dev_private; |
1212 | u32 *hw_status = dev_priv->hw_status_page; | 1212 | u32 *hw_status = dev_priv->hw_status_page; |
1213 | drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *) | 1213 | drm_i810_sarea_t *sarea_priv = (drm_i810_sarea_t *) |
diff --git a/drivers/char/drm/i830_dma.c b/drivers/char/drm/i830_dma.c index 021a0711485a..72c781a7de9a 100644 --- a/drivers/char/drm/i830_dma.c +++ b/drivers/char/drm/i830_dma.c | |||
@@ -49,7 +49,7 @@ | |||
49 | 49 | ||
50 | static struct drm_buf *i830_freelist_get(struct drm_device * dev) | 50 | static struct drm_buf *i830_freelist_get(struct drm_device * dev) |
51 | { | 51 | { |
52 | drm_device_dma_t *dma = dev->dma; | 52 | struct drm_device_dma *dma = dev->dma; |
53 | int i; | 53 | int i; |
54 | int used; | 54 | int used; |
55 | 55 | ||
@@ -208,7 +208,7 @@ static int i830_dma_get_buffer(struct drm_device * dev, drm_i830_dma_t * d, | |||
208 | 208 | ||
209 | static int i830_dma_cleanup(struct drm_device * dev) | 209 | static int i830_dma_cleanup(struct drm_device * dev) |
210 | { | 210 | { |
211 | drm_device_dma_t *dma = dev->dma; | 211 | struct drm_device_dma *dma = dev->dma; |
212 | 212 | ||
213 | /* Make sure interrupts are disabled here because the uninstall ioctl | 213 | /* Make sure interrupts are disabled here because the uninstall ioctl |
214 | * may not have been called from userspace and after dev_private | 214 | * 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 | 298 | ||
299 | static int i830_freelist_init(struct drm_device * dev, drm_i830_private_t * dev_priv) | 299 | static int i830_freelist_init(struct drm_device * dev, drm_i830_private_t * dev_priv) |
300 | { | 300 | { |
301 | drm_device_dma_t *dma = dev->dma; | 301 | struct drm_device_dma *dma = dev->dma; |
302 | int my_idx = 36; | 302 | int my_idx = 36; |
303 | u32 *hw_status = (u32 *) (dev_priv->hw_status_page + my_idx); | 303 | u32 *hw_status = (u32 *) (dev_priv->hw_status_page + my_idx); |
304 | int i; | 304 | int i; |
@@ -1218,7 +1218,7 @@ static void i830_dma_quiescent(struct drm_device * dev) | |||
1218 | static int i830_flush_queue(struct drm_device * dev) | 1218 | static int i830_flush_queue(struct drm_device * dev) |
1219 | { | 1219 | { |
1220 | drm_i830_private_t *dev_priv = dev->dev_private; | 1220 | drm_i830_private_t *dev_priv = dev->dev_private; |
1221 | drm_device_dma_t *dma = dev->dma; | 1221 | struct drm_device_dma *dma = dev->dma; |
1222 | int i, ret = 0; | 1222 | int i, ret = 0; |
1223 | RING_LOCALS; | 1223 | RING_LOCALS; |
1224 | 1224 | ||
@@ -1250,7 +1250,7 @@ static int i830_flush_queue(struct drm_device * dev) | |||
1250 | /* Must be called with the lock held */ | 1250 | /* Must be called with the lock held */ |
1251 | static void i830_reclaim_buffers(struct drm_device * dev, struct file *filp) | 1251 | static void i830_reclaim_buffers(struct drm_device * dev, struct file *filp) |
1252 | { | 1252 | { |
1253 | drm_device_dma_t *dma = dev->dma; | 1253 | struct drm_device_dma *dma = dev->dma; |
1254 | int i; | 1254 | int i; |
1255 | 1255 | ||
1256 | if (!dma) | 1256 | if (!dma) |
@@ -1295,7 +1295,7 @@ static int i830_dma_vertex(struct inode *inode, struct file *filp, | |||
1295 | { | 1295 | { |
1296 | struct drm_file *priv = filp->private_data; | 1296 | struct drm_file *priv = filp->private_data; |
1297 | struct drm_device *dev = priv->head->dev; | 1297 | struct drm_device *dev = priv->head->dev; |
1298 | drm_device_dma_t *dma = dev->dma; | 1298 | struct drm_device_dma *dma = dev->dma; |
1299 | drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private; | 1299 | drm_i830_private_t *dev_priv = (drm_i830_private_t *) dev->dev_private; |
1300 | u32 *hw_status = dev_priv->hw_status_page; | 1300 | u32 *hw_status = dev_priv->hw_status_page; |
1301 | drm_i830_sarea_t *sarea_priv = (drm_i830_sarea_t *) | 1301 | drm_i830_sarea_t *sarea_priv = (drm_i830_sarea_t *) |
diff --git a/drivers/char/drm/mga_dma.c b/drivers/char/drm/mga_dma.c index b5d41dcb29e7..38878d338d38 100644 --- a/drivers/char/drm/mga_dma.c +++ b/drivers/char/drm/mga_dma.c | |||
@@ -247,7 +247,7 @@ static void mga_freelist_print(struct drm_device * dev) | |||
247 | 247 | ||
248 | static int mga_freelist_init(struct drm_device * dev, drm_mga_private_t * dev_priv) | 248 | static int mga_freelist_init(struct drm_device * dev, drm_mga_private_t * dev_priv) |
249 | { | 249 | { |
250 | drm_device_dma_t *dma = dev->dma; | 250 | struct drm_device_dma *dma = dev->dma; |
251 | struct drm_buf *buf; | 251 | struct drm_buf *buf; |
252 | drm_mga_buf_priv_t *buf_priv; | 252 | drm_mga_buf_priv_t *buf_priv; |
253 | drm_mga_freelist_t *entry; | 253 | drm_mga_freelist_t *entry; |
@@ -313,7 +313,7 @@ static void mga_freelist_cleanup(struct drm_device * dev) | |||
313 | */ | 313 | */ |
314 | static void mga_freelist_reset(struct drm_device * dev) | 314 | static void mga_freelist_reset(struct drm_device * dev) |
315 | { | 315 | { |
316 | drm_device_dma_t *dma = dev->dma; | 316 | struct drm_device_dma *dma = dev->dma; |
317 | struct drm_buf *buf; | 317 | struct drm_buf *buf; |
318 | drm_mga_buf_priv_t *buf_priv; | 318 | drm_mga_buf_priv_t *buf_priv; |
319 | int i; | 319 | int i; |
@@ -1113,7 +1113,7 @@ static int mga_dma_get_buffers(DRMFILE filp, struct drm_device * dev, struct drm | |||
1113 | int mga_dma_buffers(DRM_IOCTL_ARGS) | 1113 | int mga_dma_buffers(DRM_IOCTL_ARGS) |
1114 | { | 1114 | { |
1115 | DRM_DEVICE; | 1115 | DRM_DEVICE; |
1116 | drm_device_dma_t *dma = dev->dma; | 1116 | struct drm_device_dma *dma = dev->dma; |
1117 | drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private; | 1117 | drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private; |
1118 | struct drm_dma __user *argp = (void __user *)data; | 1118 | struct drm_dma __user *argp = (void __user *)data; |
1119 | struct drm_dma d; | 1119 | struct drm_dma d; |
diff --git a/drivers/char/drm/mga_state.c b/drivers/char/drm/mga_state.c index 62f7acac2f59..d448b0aef33c 100644 --- a/drivers/char/drm/mga_state.c +++ b/drivers/char/drm/mga_state.c | |||
@@ -880,7 +880,7 @@ static int mga_dma_vertex(DRM_IOCTL_ARGS) | |||
880 | { | 880 | { |
881 | DRM_DEVICE; | 881 | DRM_DEVICE; |
882 | drm_mga_private_t *dev_priv = dev->dev_private; | 882 | drm_mga_private_t *dev_priv = dev->dev_private; |
883 | drm_device_dma_t *dma = dev->dma; | 883 | struct drm_device_dma *dma = dev->dma; |
884 | struct drm_buf *buf; | 884 | struct drm_buf *buf; |
885 | drm_mga_buf_priv_t *buf_priv; | 885 | drm_mga_buf_priv_t *buf_priv; |
886 | drm_mga_vertex_t vertex; | 886 | drm_mga_vertex_t vertex; |
@@ -920,7 +920,7 @@ static int mga_dma_indices(DRM_IOCTL_ARGS) | |||
920 | { | 920 | { |
921 | DRM_DEVICE; | 921 | DRM_DEVICE; |
922 | drm_mga_private_t *dev_priv = dev->dev_private; | 922 | drm_mga_private_t *dev_priv = dev->dev_private; |
923 | drm_device_dma_t *dma = dev->dma; | 923 | struct drm_device_dma *dma = dev->dma; |
924 | struct drm_buf *buf; | 924 | struct drm_buf *buf; |
925 | drm_mga_buf_priv_t *buf_priv; | 925 | drm_mga_buf_priv_t *buf_priv; |
926 | drm_mga_indices_t indices; | 926 | drm_mga_indices_t indices; |
@@ -959,7 +959,7 @@ static int mga_dma_indices(DRM_IOCTL_ARGS) | |||
959 | static int mga_dma_iload(DRM_IOCTL_ARGS) | 959 | static int mga_dma_iload(DRM_IOCTL_ARGS) |
960 | { | 960 | { |
961 | DRM_DEVICE; | 961 | DRM_DEVICE; |
962 | drm_device_dma_t *dma = dev->dma; | 962 | struct drm_device_dma *dma = dev->dma; |
963 | drm_mga_private_t *dev_priv = dev->dev_private; | 963 | drm_mga_private_t *dev_priv = dev->dev_private; |
964 | struct drm_buf *buf; | 964 | struct drm_buf *buf; |
965 | drm_mga_buf_priv_t *buf_priv; | 965 | drm_mga_buf_priv_t *buf_priv; |
diff --git a/drivers/char/drm/r128_cce.c b/drivers/char/drm/r128_cce.c index 70ba703992ef..b163ed09bd81 100644 --- a/drivers/char/drm/r128_cce.c +++ b/drivers/char/drm/r128_cce.c | |||
@@ -771,7 +771,7 @@ int r128_fullscreen(DRM_IOCTL_ARGS) | |||
771 | #if 0 | 771 | #if 0 |
772 | static int r128_freelist_init(struct drm_device * dev) | 772 | static int r128_freelist_init(struct drm_device * dev) |
773 | { | 773 | { |
774 | drm_device_dma_t *dma = dev->dma; | 774 | struct drm_device_dma *dma = dev->dma; |
775 | drm_r128_private_t *dev_priv = dev->dev_private; | 775 | drm_r128_private_t *dev_priv = dev->dev_private; |
776 | struct drm_buf *buf; | 776 | struct drm_buf *buf; |
777 | drm_r128_buf_priv_t *buf_priv; | 777 | drm_r128_buf_priv_t *buf_priv; |
@@ -817,7 +817,7 @@ static int r128_freelist_init(struct drm_device * dev) | |||
817 | 817 | ||
818 | static struct drm_buf *r128_freelist_get(struct drm_device * dev) | 818 | static struct drm_buf *r128_freelist_get(struct drm_device * dev) |
819 | { | 819 | { |
820 | drm_device_dma_t *dma = dev->dma; | 820 | struct drm_device_dma *dma = dev->dma; |
821 | drm_r128_private_t *dev_priv = dev->dev_private; | 821 | drm_r128_private_t *dev_priv = dev->dev_private; |
822 | drm_r128_buf_priv_t *buf_priv; | 822 | drm_r128_buf_priv_t *buf_priv; |
823 | struct drm_buf *buf; | 823 | struct drm_buf *buf; |
@@ -855,7 +855,7 @@ static struct drm_buf *r128_freelist_get(struct drm_device * dev) | |||
855 | 855 | ||
856 | void r128_freelist_reset(struct drm_device * dev) | 856 | void r128_freelist_reset(struct drm_device * dev) |
857 | { | 857 | { |
858 | drm_device_dma_t *dma = dev->dma; | 858 | struct drm_device_dma *dma = dev->dma; |
859 | int i; | 859 | int i; |
860 | 860 | ||
861 | for (i = 0; i < dma->buf_count; i++) { | 861 | 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 | int r128_cce_buffers(DRM_IOCTL_ARGS) | 913 | int r128_cce_buffers(DRM_IOCTL_ARGS) |
914 | { | 914 | { |
915 | DRM_DEVICE; | 915 | DRM_DEVICE; |
916 | drm_device_dma_t *dma = dev->dma; | 916 | struct drm_device_dma *dma = dev->dma; |
917 | int ret = 0; | 917 | int ret = 0; |
918 | struct drm_dma __user *argp = (void __user *)data; | 918 | struct drm_dma __user *argp = (void __user *)data; |
919 | struct drm_dma d; | 919 | struct drm_dma d; |
diff --git a/drivers/char/drm/r128_state.c b/drivers/char/drm/r128_state.c index 1fdfeb876a8e..7b334fb7d649 100644 --- a/drivers/char/drm/r128_state.c +++ b/drivers/char/drm/r128_state.c | |||
@@ -780,7 +780,7 @@ static int r128_cce_dispatch_blit(DRMFILE filp, | |||
780 | struct drm_device * dev, drm_r128_blit_t * blit) | 780 | struct drm_device * dev, drm_r128_blit_t * blit) |
781 | { | 781 | { |
782 | drm_r128_private_t *dev_priv = dev->dev_private; | 782 | drm_r128_private_t *dev_priv = dev->dev_private; |
783 | drm_device_dma_t *dma = dev->dma; | 783 | struct drm_device_dma *dma = dev->dma; |
784 | struct drm_buf *buf; | 784 | struct drm_buf *buf; |
785 | drm_r128_buf_priv_t *buf_priv; | 785 | drm_r128_buf_priv_t *buf_priv; |
786 | u32 *data; | 786 | u32 *data; |
@@ -1354,7 +1354,7 @@ static int r128_cce_vertex(DRM_IOCTL_ARGS) | |||
1354 | { | 1354 | { |
1355 | DRM_DEVICE; | 1355 | DRM_DEVICE; |
1356 | drm_r128_private_t *dev_priv = dev->dev_private; | 1356 | drm_r128_private_t *dev_priv = dev->dev_private; |
1357 | drm_device_dma_t *dma = dev->dma; | 1357 | struct drm_device_dma *dma = dev->dma; |
1358 | struct drm_buf *buf; | 1358 | struct drm_buf *buf; |
1359 | drm_r128_buf_priv_t *buf_priv; | 1359 | drm_r128_buf_priv_t *buf_priv; |
1360 | drm_r128_vertex_t vertex; | 1360 | drm_r128_vertex_t vertex; |
@@ -1413,7 +1413,7 @@ static int r128_cce_indices(DRM_IOCTL_ARGS) | |||
1413 | { | 1413 | { |
1414 | DRM_DEVICE; | 1414 | DRM_DEVICE; |
1415 | drm_r128_private_t *dev_priv = dev->dev_private; | 1415 | drm_r128_private_t *dev_priv = dev->dev_private; |
1416 | drm_device_dma_t *dma = dev->dma; | 1416 | struct drm_device_dma *dma = dev->dma; |
1417 | struct drm_buf *buf; | 1417 | struct drm_buf *buf; |
1418 | drm_r128_buf_priv_t *buf_priv; | 1418 | drm_r128_buf_priv_t *buf_priv; |
1419 | drm_r128_indices_t elts; | 1419 | drm_r128_indices_t elts; |
@@ -1483,7 +1483,7 @@ static int r128_cce_indices(DRM_IOCTL_ARGS) | |||
1483 | static int r128_cce_blit(DRM_IOCTL_ARGS) | 1483 | static int r128_cce_blit(DRM_IOCTL_ARGS) |
1484 | { | 1484 | { |
1485 | DRM_DEVICE; | 1485 | DRM_DEVICE; |
1486 | drm_device_dma_t *dma = dev->dma; | 1486 | struct drm_device_dma *dma = dev->dma; |
1487 | drm_r128_private_t *dev_priv = dev->dev_private; | 1487 | drm_r128_private_t *dev_priv = dev->dev_private; |
1488 | drm_r128_blit_t blit; | 1488 | drm_r128_blit_t blit; |
1489 | int ret; | 1489 | int ret; |
@@ -1571,7 +1571,7 @@ static int r128_cce_indirect(DRM_IOCTL_ARGS) | |||
1571 | { | 1571 | { |
1572 | DRM_DEVICE; | 1572 | DRM_DEVICE; |
1573 | drm_r128_private_t *dev_priv = dev->dev_private; | 1573 | drm_r128_private_t *dev_priv = dev->dev_private; |
1574 | drm_device_dma_t *dma = dev->dma; | 1574 | struct drm_device_dma *dma = dev->dma; |
1575 | struct drm_buf *buf; | 1575 | struct drm_buf *buf; |
1576 | drm_r128_buf_priv_t *buf_priv; | 1576 | drm_r128_buf_priv_t *buf_priv; |
1577 | drm_r128_indirect_t indirect; | 1577 | drm_r128_indirect_t indirect; |
diff --git a/drivers/char/drm/r300_cmdbuf.c b/drivers/char/drm/r300_cmdbuf.c index f8456f93b793..4e5aca6ba59a 100644 --- a/drivers/char/drm/r300_cmdbuf.c +++ b/drivers/char/drm/r300_cmdbuf.c | |||
@@ -785,7 +785,7 @@ int r300_do_cp_cmdbuf(struct drm_device *dev, | |||
785 | drm_radeon_kcmd_buffer_t *cmdbuf) | 785 | drm_radeon_kcmd_buffer_t *cmdbuf) |
786 | { | 786 | { |
787 | drm_radeon_private_t *dev_priv = dev->dev_private; | 787 | drm_radeon_private_t *dev_priv = dev->dev_private; |
788 | drm_device_dma_t *dma = dev->dma; | 788 | struct drm_device_dma *dma = dev->dma; |
789 | struct drm_buf *buf = NULL; | 789 | struct drm_buf *buf = NULL; |
790 | int emit_dispatch_age = 0; | 790 | int emit_dispatch_age = 0; |
791 | int ret = 0; | 791 | int ret = 0; |
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c index 9e80af7aeeac..831ba1a78f03 100644 --- a/drivers/char/drm/radeon_cp.c +++ b/drivers/char/drm/radeon_cp.c | |||
@@ -2048,7 +2048,7 @@ int radeon_fullscreen(DRM_IOCTL_ARGS) | |||
2048 | 2048 | ||
2049 | struct drm_buf *radeon_freelist_get(struct drm_device * dev) | 2049 | struct drm_buf *radeon_freelist_get(struct drm_device * dev) |
2050 | { | 2050 | { |
2051 | drm_device_dma_t *dma = dev->dma; | 2051 | struct drm_device_dma *dma = dev->dma; |
2052 | drm_radeon_private_t *dev_priv = dev->dev_private; | 2052 | drm_radeon_private_t *dev_priv = dev->dev_private; |
2053 | drm_radeon_buf_priv_t *buf_priv; | 2053 | drm_radeon_buf_priv_t *buf_priv; |
2054 | struct drm_buf *buf; | 2054 | struct drm_buf *buf; |
@@ -2088,7 +2088,7 @@ struct drm_buf *radeon_freelist_get(struct drm_device * dev) | |||
2088 | #if 0 | 2088 | #if 0 |
2089 | struct drm_buf *radeon_freelist_get(struct drm_device * dev) | 2089 | struct drm_buf *radeon_freelist_get(struct drm_device * dev) |
2090 | { | 2090 | { |
2091 | drm_device_dma_t *dma = dev->dma; | 2091 | struct drm_device_dma *dma = dev->dma; |
2092 | drm_radeon_private_t *dev_priv = dev->dev_private; | 2092 | drm_radeon_private_t *dev_priv = dev->dev_private; |
2093 | drm_radeon_buf_priv_t *buf_priv; | 2093 | drm_radeon_buf_priv_t *buf_priv; |
2094 | struct drm_buf *buf; | 2094 | struct drm_buf *buf; |
@@ -2122,7 +2122,7 @@ struct drm_buf *radeon_freelist_get(struct drm_device * dev) | |||
2122 | 2122 | ||
2123 | void radeon_freelist_reset(struct drm_device * dev) | 2123 | void radeon_freelist_reset(struct drm_device * dev) |
2124 | { | 2124 | { |
2125 | drm_device_dma_t *dma = dev->dma; | 2125 | struct drm_device_dma *dma = dev->dma; |
2126 | drm_radeon_private_t *dev_priv = dev->dev_private; | 2126 | drm_radeon_private_t *dev_priv = dev->dev_private; |
2127 | int i; | 2127 | int i; |
2128 | 2128 | ||
@@ -2198,7 +2198,7 @@ static int radeon_cp_get_buffers(DRMFILE filp, struct drm_device * dev, | |||
2198 | int radeon_cp_buffers(DRM_IOCTL_ARGS) | 2198 | int radeon_cp_buffers(DRM_IOCTL_ARGS) |
2199 | { | 2199 | { |
2200 | DRM_DEVICE; | 2200 | DRM_DEVICE; |
2201 | drm_device_dma_t *dma = dev->dma; | 2201 | struct drm_device_dma *dma = dev->dma; |
2202 | int ret = 0; | 2202 | int ret = 0; |
2203 | struct drm_dma __user *argp = (void __user *)data; | 2203 | struct drm_dma __user *argp = (void __user *)data; |
2204 | struct drm_dma d; | 2204 | struct drm_dma d; |
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c index 3de58c3f97b0..32d3344674f5 100644 --- a/drivers/char/drm/radeon_state.c +++ b/drivers/char/drm/radeon_state.c | |||
@@ -2208,7 +2208,7 @@ static int radeon_cp_vertex(DRM_IOCTL_ARGS) | |||
2208 | drm_radeon_private_t *dev_priv = dev->dev_private; | 2208 | drm_radeon_private_t *dev_priv = dev->dev_private; |
2209 | struct drm_file *filp_priv; | 2209 | struct drm_file *filp_priv; |
2210 | drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv; | 2210 | drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv; |
2211 | drm_device_dma_t *dma = dev->dma; | 2211 | struct drm_device_dma *dma = dev->dma; |
2212 | struct drm_buf *buf; | 2212 | struct drm_buf *buf; |
2213 | drm_radeon_vertex_t vertex; | 2213 | drm_radeon_vertex_t vertex; |
2214 | drm_radeon_tcl_prim_t prim; | 2214 | drm_radeon_tcl_prim_t prim; |
@@ -2291,7 +2291,7 @@ static int radeon_cp_indices(DRM_IOCTL_ARGS) | |||
2291 | drm_radeon_private_t *dev_priv = dev->dev_private; | 2291 | drm_radeon_private_t *dev_priv = dev->dev_private; |
2292 | struct drm_file *filp_priv; | 2292 | struct drm_file *filp_priv; |
2293 | drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv; | 2293 | drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv; |
2294 | drm_device_dma_t *dma = dev->dma; | 2294 | struct drm_device_dma *dma = dev->dma; |
2295 | struct drm_buf *buf; | 2295 | struct drm_buf *buf; |
2296 | drm_radeon_indices_t elts; | 2296 | drm_radeon_indices_t elts; |
2297 | drm_radeon_tcl_prim_t prim; | 2297 | drm_radeon_tcl_prim_t prim; |
@@ -2438,7 +2438,7 @@ static int radeon_cp_indirect(DRM_IOCTL_ARGS) | |||
2438 | { | 2438 | { |
2439 | DRM_DEVICE; | 2439 | DRM_DEVICE; |
2440 | drm_radeon_private_t *dev_priv = dev->dev_private; | 2440 | drm_radeon_private_t *dev_priv = dev->dev_private; |
2441 | drm_device_dma_t *dma = dev->dma; | 2441 | struct drm_device_dma *dma = dev->dma; |
2442 | struct drm_buf *buf; | 2442 | struct drm_buf *buf; |
2443 | drm_radeon_indirect_t indirect; | 2443 | drm_radeon_indirect_t indirect; |
2444 | RING_LOCALS; | 2444 | RING_LOCALS; |
@@ -2509,7 +2509,7 @@ static int radeon_cp_vertex2(DRM_IOCTL_ARGS) | |||
2509 | drm_radeon_private_t *dev_priv = dev->dev_private; | 2509 | drm_radeon_private_t *dev_priv = dev->dev_private; |
2510 | struct drm_file *filp_priv; | 2510 | struct drm_file *filp_priv; |
2511 | drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv; | 2511 | drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv; |
2512 | drm_device_dma_t *dma = dev->dma; | 2512 | struct drm_device_dma *dma = dev->dma; |
2513 | struct drm_buf *buf; | 2513 | struct drm_buf *buf; |
2514 | drm_radeon_vertex2_t vertex; | 2514 | drm_radeon_vertex2_t vertex; |
2515 | int i; | 2515 | int i; |
@@ -2850,7 +2850,7 @@ static int radeon_cp_cmdbuf(DRM_IOCTL_ARGS) | |||
2850 | DRM_DEVICE; | 2850 | DRM_DEVICE; |
2851 | drm_radeon_private_t *dev_priv = dev->dev_private; | 2851 | drm_radeon_private_t *dev_priv = dev->dev_private; |
2852 | struct drm_file *filp_priv; | 2852 | struct drm_file *filp_priv; |
2853 | drm_device_dma_t *dma = dev->dma; | 2853 | struct drm_device_dma *dma = dev->dma; |
2854 | struct drm_buf *buf = NULL; | 2854 | struct drm_buf *buf = NULL; |
2855 | int idx; | 2855 | int idx; |
2856 | drm_radeon_kcmd_buffer_t cmdbuf; | 2856 | drm_radeon_kcmd_buffer_t cmdbuf; |
diff --git a/drivers/char/drm/savage_bci.c b/drivers/char/drm/savage_bci.c index 2964c63a1a45..18c7235f6b73 100644 --- a/drivers/char/drm/savage_bci.c +++ b/drivers/char/drm/savage_bci.c | |||
@@ -206,7 +206,7 @@ uint16_t savage_bci_emit_event(drm_savage_private_t * dev_priv, | |||
206 | static int savage_freelist_init(struct drm_device * dev) | 206 | static int savage_freelist_init(struct drm_device * dev) |
207 | { | 207 | { |
208 | drm_savage_private_t *dev_priv = dev->dev_private; | 208 | drm_savage_private_t *dev_priv = dev->dev_private; |
209 | drm_device_dma_t *dma = dev->dma; | 209 | struct drm_device_dma *dma = dev->dma; |
210 | struct drm_buf *buf; | 210 | struct drm_buf *buf; |
211 | drm_savage_buf_priv_t *entry; | 211 | drm_savage_buf_priv_t *entry; |
212 | int i; | 212 | int i; |
@@ -1034,7 +1034,7 @@ static int savage_bci_get_buffers(DRMFILE filp, struct drm_device *dev, struct d | |||
1034 | int savage_bci_buffers(DRM_IOCTL_ARGS) | 1034 | int savage_bci_buffers(DRM_IOCTL_ARGS) |
1035 | { | 1035 | { |
1036 | DRM_DEVICE; | 1036 | DRM_DEVICE; |
1037 | drm_device_dma_t *dma = dev->dma; | 1037 | struct drm_device_dma *dma = dev->dma; |
1038 | struct drm_dma d; | 1038 | struct drm_dma d; |
1039 | int ret = 0; | 1039 | int ret = 0; |
1040 | 1040 | ||
@@ -1071,7 +1071,7 @@ int savage_bci_buffers(DRM_IOCTL_ARGS) | |||
1071 | 1071 | ||
1072 | void savage_reclaim_buffers(struct drm_device *dev, DRMFILE filp) | 1072 | void savage_reclaim_buffers(struct drm_device *dev, DRMFILE filp) |
1073 | { | 1073 | { |
1074 | drm_device_dma_t *dma = dev->dma; | 1074 | struct drm_device_dma *dma = dev->dma; |
1075 | drm_savage_private_t *dev_priv = dev->dev_private; | 1075 | drm_savage_private_t *dev_priv = dev->dev_private; |
1076 | int i; | 1076 | int i; |
1077 | 1077 | ||
diff --git a/drivers/char/drm/savage_state.c b/drivers/char/drm/savage_state.c index a30f4546cdb8..77497841478a 100644 --- a/drivers/char/drm/savage_state.c +++ b/drivers/char/drm/savage_state.c | |||
@@ -957,7 +957,7 @@ int savage_bci_cmdbuf(DRM_IOCTL_ARGS) | |||
957 | { | 957 | { |
958 | DRM_DEVICE; | 958 | DRM_DEVICE; |
959 | drm_savage_private_t *dev_priv = dev->dev_private; | 959 | drm_savage_private_t *dev_priv = dev->dev_private; |
960 | drm_device_dma_t *dma = dev->dma; | 960 | struct drm_device_dma *dma = dev->dma; |
961 | struct drm_buf *dmabuf; | 961 | struct drm_buf *dmabuf; |
962 | drm_savage_cmdbuf_t cmdbuf; | 962 | drm_savage_cmdbuf_t cmdbuf; |
963 | drm_savage_cmd_header_t *kcmd_addr = NULL; | 963 | drm_savage_cmd_header_t *kcmd_addr = NULL; |