diff options
author | Dave Airlie <airlied@linux.ie> | 2007-07-11 02:53:40 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2007-07-11 02:53:40 -0400 |
commit | 55910517af381eba4f978740e5e46e23eb269326 (patch) | |
tree | 22c82521d05029234634ebbf814b173570f18049 /drivers/char/drm/drmP.h | |
parent | cdd55a294c13f8bf05b2f4fee4c96934d5ebd2e4 (diff) |
drm: detypedeffing continues...
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drmP.h')
-rw-r--r-- | drivers/char/drm/drmP.h | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index 6cc848a83d54..c24a25606c18 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h | |||
@@ -399,7 +399,7 @@ struct drm_queue { | |||
399 | /** | 399 | /** |
400 | * Lock data. | 400 | * Lock data. |
401 | */ | 401 | */ |
402 | typedef struct drm_lock_data { | 402 | struct drm_lock_data { |
403 | struct drm_hw_lock *hw_lock; /**< Hardware lock */ | 403 | struct drm_hw_lock *hw_lock; /**< Hardware lock */ |
404 | struct file *filp; /**< File descr of lock holder (0=kernel) */ | 404 | struct file *filp; /**< File descr of lock holder (0=kernel) */ |
405 | wait_queue_head_t lock_queue; /**< Queue of blocked processes */ | 405 | wait_queue_head_t lock_queue; /**< Queue of blocked processes */ |
@@ -408,7 +408,7 @@ typedef struct drm_lock_data { | |||
408 | uint32_t kernel_waiters; | 408 | uint32_t kernel_waiters; |
409 | uint32_t user_waiters; | 409 | uint32_t user_waiters; |
410 | int idle_has_lock; | 410 | int idle_has_lock; |
411 | } drm_lock_data_t; | 411 | }; |
412 | 412 | ||
413 | /** | 413 | /** |
414 | * DMA data. | 414 | * DMA data. |
@@ -434,20 +434,20 @@ struct drm_device_dma { | |||
434 | /** | 434 | /** |
435 | * AGP memory entry. Stored as a doubly linked list. | 435 | * AGP memory entry. Stored as a doubly linked list. |
436 | */ | 436 | */ |
437 | typedef struct drm_agp_mem { | 437 | struct drm_agp_mem { |
438 | unsigned long handle; /**< handle */ | 438 | unsigned long handle; /**< handle */ |
439 | DRM_AGP_MEM *memory; | 439 | DRM_AGP_MEM *memory; |
440 | unsigned long bound; /**< address */ | 440 | unsigned long bound; /**< address */ |
441 | int pages; | 441 | int pages; |
442 | struct list_head head; | 442 | struct list_head head; |
443 | } drm_agp_mem_t; | 443 | }; |
444 | 444 | ||
445 | /** | 445 | /** |
446 | * AGP data. | 446 | * AGP data. |
447 | * | 447 | * |
448 | * \sa drm_agp_init() and drm_device::agp. | 448 | * \sa drm_agp_init() and drm_device::agp. |
449 | */ | 449 | */ |
450 | typedef struct drm_agp_head { | 450 | struct drm_agp_head { |
451 | DRM_AGP_KERN agp_info; /**< AGP device information */ | 451 | DRM_AGP_KERN agp_info; /**< AGP device information */ |
452 | struct list_head memory; | 452 | struct list_head memory; |
453 | unsigned long mode; /**< AGP mode */ | 453 | unsigned long mode; /**< AGP mode */ |
@@ -458,51 +458,51 @@ typedef struct drm_agp_head { | |||
458 | int agp_mtrr; | 458 | int agp_mtrr; |
459 | int cant_use_aperture; | 459 | int cant_use_aperture; |
460 | unsigned long page_mask; | 460 | unsigned long page_mask; |
461 | } drm_agp_head_t; | 461 | }; |
462 | 462 | ||
463 | /** | 463 | /** |
464 | * Scatter-gather memory. | 464 | * Scatter-gather memory. |
465 | */ | 465 | */ |
466 | typedef struct drm_sg_mem { | 466 | struct drm_sg_mem { |
467 | unsigned long handle; | 467 | unsigned long handle; |
468 | void *virtual; | 468 | void *virtual; |
469 | int pages; | 469 | int pages; |
470 | struct page **pagelist; | 470 | struct page **pagelist; |
471 | dma_addr_t *busaddr; | 471 | dma_addr_t *busaddr; |
472 | } drm_sg_mem_t; | 472 | }; |
473 | 473 | ||
474 | typedef struct drm_sigdata { | 474 | struct drm_sigdata { |
475 | int context; | 475 | int context; |
476 | struct drm_hw_lock *lock; | 476 | struct drm_hw_lock *lock; |
477 | } drm_sigdata_t; | 477 | }; |
478 | 478 | ||
479 | /** | 479 | /** |
480 | * Mappings list | 480 | * Mappings list |
481 | */ | 481 | */ |
482 | typedef struct drm_map_list { | 482 | struct drm_map_list { |
483 | struct list_head head; /**< list head */ | 483 | struct list_head head; /**< list head */ |
484 | drm_hash_item_t hash; | 484 | drm_hash_item_t hash; |
485 | struct drm_map *map; /**< mapping */ | 485 | struct drm_map *map; /**< mapping */ |
486 | unsigned int user_token; | 486 | unsigned int user_token; |
487 | } drm_map_list_t; | 487 | }; |
488 | 488 | ||
489 | typedef struct drm_map drm_local_map_t; | 489 | typedef struct drm_map drm_local_map_t; |
490 | 490 | ||
491 | /** | 491 | /** |
492 | * Context handle list | 492 | * Context handle list |
493 | */ | 493 | */ |
494 | typedef struct drm_ctx_list { | 494 | struct drm_ctx_list { |
495 | struct list_head head; /**< list head */ | 495 | struct list_head head; /**< list head */ |
496 | drm_context_t handle; /**< context handle */ | 496 | drm_context_t handle; /**< context handle */ |
497 | struct drm_file *tag; /**< associated fd private data */ | 497 | struct drm_file *tag; /**< associated fd private data */ |
498 | } drm_ctx_list_t; | 498 | }; |
499 | 499 | ||
500 | typedef struct drm_vbl_sig { | 500 | struct drm_vbl_sig { |
501 | struct list_head head; | 501 | struct list_head head; |
502 | unsigned int sequence; | 502 | unsigned int sequence; |
503 | struct siginfo info; | 503 | struct siginfo info; |
504 | struct task_struct *task; | 504 | struct task_struct *task; |
505 | } drm_vbl_sig_t; | 505 | }; |
506 | 506 | ||
507 | /* location of GART table */ | 507 | /* location of GART table */ |
508 | #define DRM_ATI_GART_MAIN 1 | 508 | #define DRM_ATI_GART_MAIN 1 |
@@ -512,19 +512,19 @@ typedef struct drm_vbl_sig { | |||
512 | #define DRM_ATI_GART_PCIE 2 | 512 | #define DRM_ATI_GART_PCIE 2 |
513 | #define DRM_ATI_GART_IGP 3 | 513 | #define DRM_ATI_GART_IGP 3 |
514 | 514 | ||
515 | typedef struct ati_pcigart_info { | 515 | struct drm_ati_pcigart_info { |
516 | int gart_table_location; | 516 | int gart_table_location; |
517 | int gart_reg_if; | 517 | int gart_reg_if; |
518 | void *addr; | 518 | void *addr; |
519 | dma_addr_t bus_addr; | 519 | dma_addr_t bus_addr; |
520 | drm_local_map_t mapping; | 520 | drm_local_map_t mapping; |
521 | int table_size; | 521 | int table_size; |
522 | } drm_ati_pcigart_info; | 522 | }; |
523 | 523 | ||
524 | /* | 524 | /* |
525 | * Generic memory manager structs | 525 | * Generic memory manager structs |
526 | */ | 526 | */ |
527 | typedef struct drm_mm_node { | 527 | struct drm_mm_node { |
528 | struct list_head fl_entry; | 528 | struct list_head fl_entry; |
529 | struct list_head ml_entry; | 529 | struct list_head ml_entry; |
530 | int free; | 530 | int free; |
@@ -532,12 +532,12 @@ typedef struct drm_mm_node { | |||
532 | unsigned long size; | 532 | unsigned long size; |
533 | struct drm_mm *mm; | 533 | struct drm_mm *mm; |
534 | void *private; | 534 | void *private; |
535 | } drm_mm_node_t; | 535 | }; |
536 | 536 | ||
537 | typedef struct drm_mm { | 537 | struct drm_mm { |
538 | struct list_head fl_entry; | 538 | struct list_head fl_entry; |
539 | struct list_head ml_entry; | 539 | struct list_head ml_entry; |
540 | } drm_mm_t; | 540 | }; |
541 | 541 | ||
542 | /** | 542 | /** |
543 | * DRM driver structure. This structure represent the common code for | 543 | * DRM driver structure. This structure represent the common code for |
@@ -680,7 +680,7 @@ struct drm_device { | |||
680 | int max_context; | 680 | int max_context; |
681 | 681 | ||
682 | struct list_head vmalist; /**< List of vmas (for debugging) */ | 682 | struct list_head vmalist; /**< List of vmas (for debugging) */ |
683 | drm_lock_data_t lock; /**< Information on hardware lock */ | 683 | struct drm_lock_data lock; /**< Information on hardware lock */ |
684 | /*@} */ | 684 | /*@} */ |
685 | 685 | ||
686 | /** \name DMA queues (contexts) */ | 686 | /** \name DMA queues (contexts) */ |
@@ -728,7 +728,7 @@ struct drm_device { | |||
728 | wait_queue_head_t buf_readers; /**< Processes waiting to read */ | 728 | wait_queue_head_t buf_readers; /**< Processes waiting to read */ |
729 | wait_queue_head_t buf_writers; /**< Processes waiting to ctx switch */ | 729 | wait_queue_head_t buf_writers; /**< Processes waiting to ctx switch */ |
730 | 730 | ||
731 | drm_agp_head_t *agp; /**< AGP data */ | 731 | struct drm_agp_head *agp; /**< AGP data */ |
732 | 732 | ||
733 | struct pci_dev *pdev; /**< PCI device structure */ | 733 | struct pci_dev *pdev; /**< PCI device structure */ |
734 | int pci_vendor; /**< PCI vendor id */ | 734 | int pci_vendor; /**< PCI vendor id */ |
@@ -736,10 +736,10 @@ struct drm_device { | |||
736 | #ifdef __alpha__ | 736 | #ifdef __alpha__ |
737 | struct pci_controller *hose; | 737 | struct pci_controller *hose; |
738 | #endif | 738 | #endif |
739 | drm_sg_mem_t *sg; /**< Scatter gather memory */ | 739 | struct drm_sg_mem *sg; /**< Scatter gather memory */ |
740 | unsigned long *ctx_bitmap; /**< context bitmap */ | 740 | unsigned long *ctx_bitmap; /**< context bitmap */ |
741 | void *dev_private; /**< device private data */ | 741 | void *dev_private; /**< device private data */ |
742 | drm_sigdata_t sigdata; /**< For block_all_signals */ | 742 | struct drm_sigdata sigdata; /**< For block_all_signals */ |
743 | sigset_t sigmask; | 743 | sigset_t sigmask; |
744 | 744 | ||
745 | struct drm_driver *driver; | 745 | struct drm_driver *driver; |
@@ -915,10 +915,10 @@ extern int drm_lock(struct inode *inode, struct file *filp, | |||
915 | unsigned int cmd, unsigned long arg); | 915 | unsigned int cmd, unsigned long arg); |
916 | extern int drm_unlock(struct inode *inode, struct file *filp, | 916 | extern int drm_unlock(struct inode *inode, struct file *filp, |
917 | unsigned int cmd, unsigned long arg); | 917 | unsigned int cmd, unsigned long arg); |
918 | extern int drm_lock_take(drm_lock_data_t *lock_data, unsigned int context); | 918 | extern int drm_lock_take(struct drm_lock_data *lock_data, unsigned int context); |
919 | extern int drm_lock_free(drm_lock_data_t *lock_data, unsigned int context); | 919 | extern int drm_lock_free(struct drm_lock_data *lock_data, unsigned int context); |
920 | extern void drm_idlelock_take(drm_lock_data_t *lock_data); | 920 | extern void drm_idlelock_take(struct drm_lock_data *lock_data); |
921 | extern void drm_idlelock_release(drm_lock_data_t *lock_data); | 921 | extern void drm_idlelock_release(struct drm_lock_data *lock_data); |
922 | 922 | ||
923 | /* | 923 | /* |
924 | * These are exported to drivers so that they can implement fencing using | 924 | * These are exported to drivers so that they can implement fencing using |
@@ -979,7 +979,7 @@ extern void drm_vbl_send_signals(struct drm_device *dev); | |||
979 | extern void drm_locked_tasklet(struct drm_device *dev, void(*func)(struct drm_device*)); | 979 | extern void drm_locked_tasklet(struct drm_device *dev, void(*func)(struct drm_device*)); |
980 | 980 | ||
981 | /* AGP/GART support (drm_agpsupport.h) */ | 981 | /* AGP/GART support (drm_agpsupport.h) */ |
982 | extern drm_agp_head_t *drm_agp_init(struct drm_device *dev); | 982 | extern struct drm_agp_head *drm_agp_init(struct drm_device *dev); |
983 | extern int drm_agp_acquire(struct drm_device *dev); | 983 | extern int drm_agp_acquire(struct drm_device *dev); |
984 | extern int drm_agp_acquire_ioctl(struct inode *inode, struct file *filp, | 984 | extern int drm_agp_acquire_ioctl(struct inode *inode, struct file *filp, |
985 | unsigned int cmd, unsigned long arg); | 985 | unsigned int cmd, unsigned long arg); |
@@ -1033,7 +1033,7 @@ extern int drm_proc_cleanup(int minor, | |||
1033 | struct proc_dir_entry *dev_root); | 1033 | struct proc_dir_entry *dev_root); |
1034 | 1034 | ||
1035 | /* Scatter Gather Support (drm_scatter.h) */ | 1035 | /* Scatter Gather Support (drm_scatter.h) */ |
1036 | extern void drm_sg_cleanup(drm_sg_mem_t * entry); | 1036 | extern void drm_sg_cleanup(struct drm_sg_mem * entry); |
1037 | extern int drm_sg_alloc(struct inode *inode, struct file *filp, | 1037 | extern int drm_sg_alloc(struct inode *inode, struct file *filp, |
1038 | unsigned int cmd, unsigned long arg); | 1038 | unsigned int cmd, unsigned long arg); |
1039 | extern int drm_sg_free(struct inode *inode, struct file *filp, | 1039 | extern int drm_sg_free(struct inode *inode, struct file *filp, |
@@ -1041,9 +1041,9 @@ extern int drm_sg_free(struct inode *inode, struct file *filp, | |||
1041 | 1041 | ||
1042 | /* ATI PCIGART support (ati_pcigart.h) */ | 1042 | /* ATI PCIGART support (ati_pcigart.h) */ |
1043 | extern int drm_ati_pcigart_init(struct drm_device *dev, | 1043 | extern int drm_ati_pcigart_init(struct drm_device *dev, |
1044 | drm_ati_pcigart_info * gart_info); | 1044 | struct drm_ati_pcigart_info * gart_info); |
1045 | extern int drm_ati_pcigart_cleanup(struct drm_device *dev, | 1045 | extern int drm_ati_pcigart_cleanup(struct drm_device *dev, |
1046 | drm_ati_pcigart_info * gart_info); | 1046 | struct drm_ati_pcigart_info * gart_info); |
1047 | 1047 | ||
1048 | extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size, | 1048 | extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size, |
1049 | size_t align, dma_addr_t maxaddr); | 1049 | size_t align, dma_addr_t maxaddr); |
@@ -1060,18 +1060,18 @@ extern void drm_sysfs_device_remove(struct class_device *class_dev); | |||
1060 | /* | 1060 | /* |
1061 | * Basic memory manager support (drm_mm.c) | 1061 | * Basic memory manager support (drm_mm.c) |
1062 | */ | 1062 | */ |
1063 | extern drm_mm_node_t *drm_mm_get_block(drm_mm_node_t * parent, | 1063 | extern struct drm_mm_node *drm_mm_get_block(struct drm_mm_node * parent, |
1064 | unsigned long size, | 1064 | unsigned long size, |
1065 | unsigned alignment); | 1065 | unsigned alignment); |
1066 | void drm_mm_put_block(drm_mm_node_t * cur); | 1066 | void drm_mm_put_block(struct drm_mm_node * cur); |
1067 | extern drm_mm_node_t *drm_mm_search_free(const drm_mm_t *mm, unsigned long size, | 1067 | extern struct drm_mm_node *drm_mm_search_free(const struct drm_mm *mm, unsigned long size, |
1068 | unsigned alignment, int best_match); | 1068 | unsigned alignment, int best_match); |
1069 | extern int drm_mm_init(drm_mm_t *mm, unsigned long start, unsigned long size); | 1069 | extern int drm_mm_init(struct drm_mm *mm, unsigned long start, unsigned long size); |
1070 | extern void drm_mm_takedown(drm_mm_t *mm); | 1070 | extern void drm_mm_takedown(struct drm_mm *mm); |
1071 | extern int drm_mm_clean(drm_mm_t *mm); | 1071 | extern int drm_mm_clean(struct drm_mm *mm); |
1072 | extern unsigned long drm_mm_tail_space(drm_mm_t *mm); | 1072 | extern unsigned long drm_mm_tail_space(struct drm_mm *mm); |
1073 | extern int drm_mm_remove_space_from_tail(drm_mm_t *mm, unsigned long size); | 1073 | extern int drm_mm_remove_space_from_tail(struct drm_mm *mm, unsigned long size); |
1074 | extern int drm_mm_add_space_to_tail(drm_mm_t *mm, unsigned long size); | 1074 | extern int drm_mm_add_space_to_tail(struct drm_mm *mm, unsigned long size); |
1075 | 1075 | ||
1076 | extern void drm_core_ioremap(struct drm_map *map, struct drm_device *dev); | 1076 | extern void drm_core_ioremap(struct drm_map *map, struct drm_device *dev); |
1077 | extern void drm_core_ioremapfree(struct drm_map *map, struct drm_device *dev); | 1077 | extern void drm_core_ioremapfree(struct drm_map *map, struct drm_device *dev); |
@@ -1079,7 +1079,7 @@ extern void drm_core_ioremapfree(struct drm_map *map, struct drm_device *dev); | |||
1079 | static __inline__ struct drm_map *drm_core_findmap(struct drm_device *dev, | 1079 | static __inline__ struct drm_map *drm_core_findmap(struct drm_device *dev, |
1080 | unsigned int token) | 1080 | unsigned int token) |
1081 | { | 1081 | { |
1082 | drm_map_list_t *_entry; | 1082 | struct drm_map_list *_entry; |
1083 | list_for_each_entry(_entry, &dev->maplist, head) | 1083 | list_for_each_entry(_entry, &dev->maplist, head) |
1084 | if (_entry->user_token == token) | 1084 | if (_entry->user_token == token) |
1085 | return _entry->map; | 1085 | return _entry->map; |