aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/drmP.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/drm/drmP.h')
-rw-r--r--drivers/char/drm/drmP.h45
1 files changed, 23 insertions, 22 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 8634f7613620..a785f3e79b1c 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -395,7 +395,7 @@ typedef struct drm_queue {
395 atomic_t total_flushed; /**< Total flushes statistic */ 395 atomic_t total_flushed; /**< Total flushes statistic */
396 atomic_t total_locks; /**< Total locks statistics */ 396 atomic_t total_locks; /**< Total locks statistics */
397#endif 397#endif
398 drm_ctx_flags_t flags; /**< Context preserving and 2D-only */ 398 enum drm_ctx_flags flags; /**< Context preserving and 2D-only */
399 drm_waitlist_t waitlist; /**< Pending buffers */ 399 drm_waitlist_t waitlist; /**< Pending buffers */
400 wait_queue_head_t flush_queue; /**< Processes waiting until flush */ 400 wait_queue_head_t flush_queue; /**< Processes waiting until flush */
401} drm_queue_t; 401} drm_queue_t;
@@ -404,7 +404,7 @@ typedef struct drm_queue {
404 * Lock data. 404 * Lock data.
405 */ 405 */
406typedef struct drm_lock_data { 406typedef struct drm_lock_data {
407 drm_hw_lock_t *hw_lock; /**< Hardware lock */ 407 struct drm_hw_lock *hw_lock; /**< Hardware lock */
408 struct file *filp; /**< File descr of lock holder (0=kernel) */ 408 struct file *filp; /**< File descr of lock holder (0=kernel) */
409 wait_queue_head_t lock_queue; /**< Queue of blocked processes */ 409 wait_queue_head_t lock_queue; /**< Queue of blocked processes */
410 unsigned long lock_time; /**< Time of last lock in jiffies */ 410 unsigned long lock_time; /**< Time of last lock in jiffies */
@@ -477,7 +477,7 @@ typedef struct drm_sg_mem {
477 477
478typedef struct drm_sigdata { 478typedef struct drm_sigdata {
479 int context; 479 int context;
480 drm_hw_lock_t *lock; 480 struct drm_hw_lock *lock;
481} drm_sigdata_t; 481} drm_sigdata_t;
482 482
483/** 483/**
@@ -486,11 +486,11 @@ typedef struct drm_sigdata {
486typedef struct drm_map_list { 486typedef struct drm_map_list {
487 struct list_head head; /**< list head */ 487 struct list_head head; /**< list head */
488 drm_hash_item_t hash; 488 drm_hash_item_t hash;
489 drm_map_t *map; /**< mapping */ 489 struct drm_map *map; /**< mapping */
490 unsigned int user_token; 490 unsigned int user_token;
491} drm_map_list_t; 491} drm_map_list_t;
492 492
493typedef drm_map_t drm_local_map_t; 493typedef struct drm_map drm_local_map_t;
494 494
495/** 495/**
496 * Context handle list 496 * Context handle list
@@ -594,9 +594,10 @@ struct drm_driver {
594 struct file *filp); 594 struct file *filp);
595 void (*reclaim_buffers_idlelocked) (struct drm_device *dev, 595 void (*reclaim_buffers_idlelocked) (struct drm_device *dev,
596 struct file * filp); 596 struct file * filp);
597 unsigned long (*get_map_ofs) (drm_map_t * map); 597 unsigned long (*get_map_ofs) (struct drm_map * map);
598 unsigned long (*get_reg_ofs) (struct drm_device * dev); 598 unsigned long (*get_reg_ofs) (struct drm_device * dev);
599 void (*set_version) (struct drm_device * dev, drm_set_version_t * sv); 599 void (*set_version) (struct drm_device * dev,
600 struct drm_set_version *sv);
600 601
601 int major; 602 int major;
602 int minor; 603 int minor;
@@ -656,7 +657,7 @@ typedef struct drm_device {
656 /** \name Performance counters */ 657 /** \name Performance counters */
657 /*@{ */ 658 /*@{ */
658 unsigned long counters; 659 unsigned long counters;
659 drm_stat_type_t types[15]; 660 enum drm_stat_type types[15];
660 atomic_t counts[15]; 661 atomic_t counts[15];
661 /*@} */ 662 /*@} */
662 663
@@ -679,7 +680,7 @@ typedef struct drm_device {
679 int ctx_count; /**< Number of context handles */ 680 int ctx_count; /**< Number of context handles */
680 struct mutex ctxlist_mutex; /**< For ctxlist */ 681 struct mutex ctxlist_mutex; /**< For ctxlist */
681 682
682 drm_map_t **context_sareas; /**< per-context SAREA's */ 683 struct drm_map **context_sareas; /**< per-context SAREA's */
683 int max_context; 684 int max_context;
684 685
685 struct list_head vmalist; /**< List of vmas (for debugging) */ 686 struct list_head vmalist; /**< List of vmas (for debugging) */
@@ -756,7 +757,7 @@ typedef struct drm_device {
756 unsigned int drw_bitfield_length; 757 unsigned int drw_bitfield_length;
757 u32 *drw_bitfield; 758 u32 *drw_bitfield;
758 unsigned int drw_info_length; 759 unsigned int drw_info_length;
759 drm_drawable_info_t **drw_info; 760 struct drm_drawable_info **drw_info;
760 /*@} */ 761 /*@} */
761} drm_device_t; 762} drm_device_t;
762 763
@@ -904,7 +905,7 @@ extern int drm_rmdraw(struct inode *inode, struct file *filp,
904 unsigned int cmd, unsigned long arg); 905 unsigned int cmd, unsigned long arg);
905extern int drm_update_drawable_info(struct inode *inode, struct file *filp, 906extern int drm_update_drawable_info(struct inode *inode, struct file *filp,
906 unsigned int cmd, unsigned long arg); 907 unsigned int cmd, unsigned long arg);
907extern drm_drawable_info_t *drm_get_drawable_info(drm_device_t *dev, 908extern struct drm_drawable_info *drm_get_drawable_info(drm_device_t *dev,
908 drm_drawable_t id); 909 drm_drawable_t id);
909 910
910 /* Authentication IOCTL support (drm_auth.h) */ 911 /* Authentication IOCTL support (drm_auth.h) */
@@ -932,11 +933,11 @@ extern int drm_i_have_hw_lock(struct file *filp);
932extern int drm_kernel_take_hw_lock(struct file *filp); 933extern int drm_kernel_take_hw_lock(struct file *filp);
933 934
934 /* Buffer management support (drm_bufs.h) */ 935 /* Buffer management support (drm_bufs.h) */
935extern int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request); 936extern int drm_addbufs_agp(drm_device_t * dev, struct drm_buf_desc * request);
936extern int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request); 937extern int drm_addbufs_pci(drm_device_t * dev, struct drm_buf_desc * request);
937extern int drm_addmap(drm_device_t * dev, unsigned int offset, 938extern int drm_addmap(drm_device_t * dev, unsigned int offset,
938 unsigned int size, drm_map_type_t type, 939 unsigned int size, enum drm_map_type type,
939 drm_map_flags_t flags, drm_local_map_t ** map_ptr); 940 enum drm_map_flags flags, drm_local_map_t ** map_ptr);
940extern int drm_addmap_ioctl(struct inode *inode, struct file *filp, 941extern int drm_addmap_ioctl(struct inode *inode, struct file *filp,
941 unsigned int cmd, unsigned long arg); 942 unsigned int cmd, unsigned long arg);
942extern int drm_rmmap(drm_device_t * dev, drm_local_map_t * map); 943extern int drm_rmmap(drm_device_t * dev, drm_local_map_t * map);
@@ -989,22 +990,22 @@ extern int drm_agp_acquire_ioctl(struct inode *inode, struct file *filp,
989extern int drm_agp_release(drm_device_t * dev); 990extern int drm_agp_release(drm_device_t * dev);
990extern int drm_agp_release_ioctl(struct inode *inode, struct file *filp, 991extern int drm_agp_release_ioctl(struct inode *inode, struct file *filp,
991 unsigned int cmd, unsigned long arg); 992 unsigned int cmd, unsigned long arg);
992extern int drm_agp_enable(drm_device_t * dev, drm_agp_mode_t mode); 993extern int drm_agp_enable(drm_device_t * dev, struct drm_agp_mode mode);
993extern int drm_agp_enable_ioctl(struct inode *inode, struct file *filp, 994extern int drm_agp_enable_ioctl(struct inode *inode, struct file *filp,
994 unsigned int cmd, unsigned long arg); 995 unsigned int cmd, unsigned long arg);
995extern int drm_agp_info(drm_device_t * dev, drm_agp_info_t * info); 996extern int drm_agp_info(drm_device_t * dev, struct drm_agp_info * info);
996extern int drm_agp_info_ioctl(struct inode *inode, struct file *filp, 997extern int drm_agp_info_ioctl(struct inode *inode, struct file *filp,
997 unsigned int cmd, unsigned long arg); 998 unsigned int cmd, unsigned long arg);
998extern int drm_agp_alloc(drm_device_t *dev, drm_agp_buffer_t *request); 999extern int drm_agp_alloc(drm_device_t *dev, struct drm_agp_buffer *request);
999extern int drm_agp_alloc_ioctl(struct inode *inode, struct file *filp, 1000extern int drm_agp_alloc_ioctl(struct inode *inode, struct file *filp,
1000 unsigned int cmd, unsigned long arg); 1001 unsigned int cmd, unsigned long arg);
1001extern int drm_agp_free(drm_device_t *dev, drm_agp_buffer_t *request); 1002extern int drm_agp_free(drm_device_t *dev, struct drm_agp_buffer *request);
1002extern int drm_agp_free_ioctl(struct inode *inode, struct file *filp, 1003extern int drm_agp_free_ioctl(struct inode *inode, struct file *filp,
1003 unsigned int cmd, unsigned long arg); 1004 unsigned int cmd, unsigned long arg);
1004extern int drm_agp_unbind(drm_device_t *dev, drm_agp_binding_t *request); 1005extern int drm_agp_unbind(drm_device_t *dev, struct drm_agp_binding *request);
1005extern int drm_agp_unbind_ioctl(struct inode *inode, struct file *filp, 1006extern int drm_agp_unbind_ioctl(struct inode *inode, struct file *filp,
1006 unsigned int cmd, unsigned long arg); 1007 unsigned int cmd, unsigned long arg);
1007extern int drm_agp_bind(drm_device_t *dev, drm_agp_binding_t *request); 1008extern int drm_agp_bind(drm_device_t *dev, struct drm_agp_binding *request);
1008extern int drm_agp_bind_ioctl(struct inode *inode, struct file *filp, 1009extern int drm_agp_bind_ioctl(struct inode *inode, struct file *filp,
1009 unsigned int cmd, unsigned long arg); 1010 unsigned int cmd, unsigned long arg);
1010extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge, 1011extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge,
@@ -1137,7 +1138,7 @@ extern void *drm_calloc(size_t nmemb, size_t size, int area);
1137 1138
1138/*@}*/ 1139/*@}*/
1139 1140
1140extern unsigned long drm_core_get_map_ofs(drm_map_t * map); 1141extern unsigned long drm_core_get_map_ofs(struct drm_map * map);
1141extern unsigned long drm_core_get_reg_ofs(struct drm_device *dev); 1142extern unsigned long drm_core_get_reg_ofs(struct drm_device *dev);
1142 1143
1143#endif /* __KERNEL__ */ 1144#endif /* __KERNEL__ */