aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/drmP.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2007-07-11 01:53:27 -0400
committerDave Airlie <airlied@linux.ie>2007-07-11 01:53:27 -0400
commit84b1fd103dbbe01b5905db1444d3fc8afa9a7207 (patch)
tree2088f4c8e68553e2d4f5d55fa7a714eb3fa09f9e /drivers/char/drm/drmP.h
parentc60ce623bd16137627009d05e311d877729f2ad6 (diff)
drm: remove drm_file_t, drm_device_t and drm_head_t typedefs
some drivers still todo. Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drmP.h')
-rw-r--r--drivers/char/drm/drmP.h136
1 files changed, 68 insertions, 68 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index a785f3e79b1..63ee0538813 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -366,7 +366,7 @@ typedef struct drm_buf_entry {
366} drm_buf_entry_t; 366} drm_buf_entry_t;
367 367
368/** File private data */ 368/** File private data */
369typedef struct drm_file { 369struct drm_file {
370 int authenticated; 370 int authenticated;
371 int master; 371 int master;
372 int minor; 372 int minor;
@@ -379,7 +379,7 @@ typedef struct drm_file {
379 int remove_auth_on_close; 379 int remove_auth_on_close;
380 unsigned long lock_count; 380 unsigned long lock_count;
381 void *driver_priv; 381 void *driver_priv;
382} drm_file_t; 382};
383 383
384/** Wait queue */ 384/** Wait queue */
385typedef struct drm_queue { 385typedef struct drm_queue {
@@ -498,7 +498,7 @@ typedef struct drm_map drm_local_map_t;
498typedef struct drm_ctx_list { 498typedef struct drm_ctx_list {
499 struct list_head head; /**< list head */ 499 struct list_head head; /**< list head */
500 drm_context_t handle; /**< context handle */ 500 drm_context_t handle; /**< context handle */
501 drm_file_t *tag; /**< associated fd private data */ 501 struct drm_file *tag; /**< associated fd private data */
502} drm_ctx_list_t; 502} drm_ctx_list_t;
503 503
504typedef struct drm_vbl_sig { 504typedef struct drm_vbl_sig {
@@ -553,21 +553,21 @@ struct drm_device;
553struct drm_driver { 553struct drm_driver {
554 int (*load) (struct drm_device *, unsigned long flags); 554 int (*load) (struct drm_device *, unsigned long flags);
555 int (*firstopen) (struct drm_device *); 555 int (*firstopen) (struct drm_device *);
556 int (*open) (struct drm_device *, drm_file_t *); 556 int (*open) (struct drm_device *, struct drm_file *);
557 void (*preclose) (struct drm_device *, struct file * filp); 557 void (*preclose) (struct drm_device *, struct file * filp);
558 void (*postclose) (struct drm_device *, drm_file_t *); 558 void (*postclose) (struct drm_device *, struct drm_file *);
559 void (*lastclose) (struct drm_device *); 559 void (*lastclose) (struct drm_device *);
560 int (*unload) (struct drm_device *); 560 int (*unload) (struct drm_device *);
561 int (*dma_ioctl) (DRM_IOCTL_ARGS); 561 int (*dma_ioctl) (DRM_IOCTL_ARGS);
562 void (*dma_ready) (struct drm_device *); 562 void (*dma_ready) (struct drm_device *);
563 int (*dma_quiescent) (struct drm_device *); 563 int (*dma_quiescent) (struct drm_device *);
564 int (*context_ctor) (struct drm_device * dev, int context); 564 int (*context_ctor) (struct drm_device *dev, int context);
565 int (*context_dtor) (struct drm_device * dev, int context); 565 int (*context_dtor) (struct drm_device *dev, int context);
566 int (*kernel_context_switch) (struct drm_device * dev, int old, 566 int (*kernel_context_switch) (struct drm_device *dev, int old,
567 int new); 567 int new);
568 void (*kernel_context_switch_unlock) (struct drm_device * dev); 568 void (*kernel_context_switch_unlock) (struct drm_device *dev);
569 int (*vblank_wait) (struct drm_device * dev, unsigned int *sequence); 569 int (*vblank_wait) (struct drm_device *dev, unsigned int *sequence);
570 int (*vblank_wait2) (struct drm_device * dev, unsigned int *sequence); 570 int (*vblank_wait2) (struct drm_device *dev, unsigned int *sequence);
571 int (*dri_library_name) (struct drm_device *dev, char *buf); 571 int (*dri_library_name) (struct drm_device *dev, char *buf);
572 572
573 /** 573 /**
@@ -581,22 +581,22 @@ struct drm_driver {
581 * card is absolutely \b not AGP (return of 0), absolutely \b is AGP 581 * card is absolutely \b not AGP (return of 0), absolutely \b is AGP
582 * (return of 1), or may or may not be AGP (return of 2). 582 * (return of 1), or may or may not be AGP (return of 2).
583 */ 583 */
584 int (*device_is_agp) (struct drm_device * dev); 584 int (*device_is_agp) (struct drm_device *dev);
585 585
586 /* these have to be filled in */ 586 /* these have to be filled in */
587 587
588 irqreturn_t(*irq_handler) (DRM_IRQ_ARGS); 588 irqreturn_t(*irq_handler) (DRM_IRQ_ARGS);
589 void (*irq_preinstall) (struct drm_device * dev); 589 void (*irq_preinstall) (struct drm_device *dev);
590 void (*irq_postinstall) (struct drm_device * dev); 590 void (*irq_postinstall) (struct drm_device *dev);
591 void (*irq_uninstall) (struct drm_device * dev); 591 void (*irq_uninstall) (struct drm_device *dev);
592 void (*reclaim_buffers) (struct drm_device * dev, struct file * filp); 592 void (*reclaim_buffers) (struct drm_device *dev, struct file * filp);
593 void (*reclaim_buffers_locked) (struct drm_device *dev, 593 void (*reclaim_buffers_locked) (struct drm_device *dev,
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) (struct drm_map * 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, 599 void (*set_version) (struct drm_device *dev,
600 struct drm_set_version *sv); 600 struct drm_set_version *sv);
601 601
602 int major; 602 int major;
@@ -619,19 +619,19 @@ struct drm_driver {
619 * that may contain multiple heads. Embed one per head of these in the 619 * that may contain multiple heads. Embed one per head of these in the
620 * private drm_device structure. 620 * private drm_device structure.
621 */ 621 */
622typedef struct drm_head { 622struct drm_head {
623 int minor; /**< Minor device number */ 623 int minor; /**< Minor device number */
624 struct drm_device *dev; 624 struct drm_device *dev;
625 struct proc_dir_entry *dev_root; /**< proc directory entry */ 625 struct proc_dir_entry *dev_root; /**< proc directory entry */
626 dev_t device; /**< Device number for mknod */ 626 dev_t device; /**< Device number for mknod */
627 struct class_device *dev_class; 627 struct class_device *dev_class;
628} drm_head_t; 628};
629 629
630/** 630/**
631 * DRM device structure. This structure represent a complete card that 631 * DRM device structure. This structure represent a complete card that
632 * may contain multiple heads. 632 * may contain multiple heads.
633 */ 633 */
634typedef struct drm_device { 634struct drm_device {
635 char *unique; /**< Unique identifier: e.g., busid */ 635 char *unique; /**< Unique identifier: e.g., busid */
636 int unique_len; /**< Length of unique field */ 636 int unique_len; /**< Length of unique field */
637 char *devname; /**< For /proc/interrupts */ 637 char *devname; /**< For /proc/interrupts */
@@ -749,7 +749,7 @@ typedef struct drm_device {
749 struct drm_driver *driver; 749 struct drm_driver *driver;
750 drm_local_map_t *agp_buffer_map; 750 drm_local_map_t *agp_buffer_map;
751 unsigned int agp_buffer_token; 751 unsigned int agp_buffer_token;
752 drm_head_t primary; /**< primary screen head */ 752 struct drm_head primary; /**< primary screen head */
753 753
754 /** \name Drawable information */ 754 /** \name Drawable information */
755 /*@{ */ 755 /*@{ */
@@ -759,7 +759,7 @@ typedef struct drm_device {
759 unsigned int drw_info_length; 759 unsigned int drw_info_length;
760 struct drm_drawable_info **drw_info; 760 struct drm_drawable_info **drw_info;
761 /*@} */ 761 /*@} */
762} drm_device_t; 762};
763 763
764static __inline__ int drm_core_check_feature(struct drm_device *dev, 764static __inline__ int drm_core_check_feature(struct drm_device *dev,
765 int feature) 765 int feature)
@@ -831,7 +831,7 @@ extern int drm_ioctl(struct inode *inode, struct file *filp,
831 unsigned int cmd, unsigned long arg); 831 unsigned int cmd, unsigned long arg);
832extern long drm_compat_ioctl(struct file *filp, 832extern long drm_compat_ioctl(struct file *filp,
833 unsigned int cmd, unsigned long arg); 833 unsigned int cmd, unsigned long arg);
834extern int drm_lastclose(drm_device_t *dev); 834extern int drm_lastclose(struct drm_device *dev);
835 835
836 /* Device support (drm_fops.h) */ 836 /* Device support (drm_fops.h) */
837extern int drm_open(struct inode *inode, struct file *filp); 837extern int drm_open(struct inode *inode, struct file *filp);
@@ -850,7 +850,7 @@ extern int drm_mem_info(char *buf, char **start, off_t offset,
850 int request, int *eof, void *data); 850 int request, int *eof, void *data);
851extern void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area); 851extern void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area);
852 852
853extern DRM_AGP_MEM *drm_alloc_agp(drm_device_t * dev, int pages, u32 type); 853extern DRM_AGP_MEM *drm_alloc_agp(struct drm_device *dev, int pages, u32 type);
854extern int drm_free_agp(DRM_AGP_MEM * handle, int pages); 854extern int drm_free_agp(DRM_AGP_MEM * handle, int pages);
855extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start); 855extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start);
856extern int drm_unbind_agp(DRM_AGP_MEM * handle); 856extern int drm_unbind_agp(DRM_AGP_MEM * handle);
@@ -889,9 +889,9 @@ extern int drm_newctx(struct inode *inode, struct file *filp,
889extern int drm_rmctx(struct inode *inode, struct file *filp, 889extern int drm_rmctx(struct inode *inode, struct file *filp,
890 unsigned int cmd, unsigned long arg); 890 unsigned int cmd, unsigned long arg);
891 891
892extern int drm_ctxbitmap_init(drm_device_t * dev); 892extern int drm_ctxbitmap_init(struct drm_device *dev);
893extern void drm_ctxbitmap_cleanup(drm_device_t * dev); 893extern void drm_ctxbitmap_cleanup(struct drm_device *dev);
894extern void drm_ctxbitmap_free(drm_device_t * dev, int ctx_handle); 894extern void drm_ctxbitmap_free(struct drm_device *dev, int ctx_handle);
895 895
896extern int drm_setsareactx(struct inode *inode, struct file *filp, 896extern int drm_setsareactx(struct inode *inode, struct file *filp,
897 unsigned int cmd, unsigned long arg); 897 unsigned int cmd, unsigned long arg);
@@ -905,7 +905,7 @@ extern int drm_rmdraw(struct inode *inode, struct file *filp,
905 unsigned int cmd, unsigned long arg); 905 unsigned int cmd, unsigned long arg);
906extern int drm_update_drawable_info(struct inode *inode, struct file *filp, 906extern int drm_update_drawable_info(struct inode *inode, struct file *filp,
907 unsigned int cmd, unsigned long arg); 907 unsigned int cmd, unsigned long arg);
908extern struct drm_drawable_info *drm_get_drawable_info(drm_device_t *dev, 908extern struct drm_drawable_info *drm_get_drawable_info(struct drm_device *dev,
909 drm_drawable_t id); 909 drm_drawable_t id);
910 910
911 /* Authentication IOCTL support (drm_auth.h) */ 911 /* Authentication IOCTL support (drm_auth.h) */
@@ -933,15 +933,15 @@ extern int drm_i_have_hw_lock(struct file *filp);
933extern int drm_kernel_take_hw_lock(struct file *filp); 933extern int drm_kernel_take_hw_lock(struct file *filp);
934 934
935 /* Buffer management support (drm_bufs.h) */ 935 /* Buffer management support (drm_bufs.h) */
936extern int drm_addbufs_agp(drm_device_t * dev, struct drm_buf_desc * request); 936extern int drm_addbufs_agp(struct drm_device *dev, struct drm_buf_desc * request);
937extern int drm_addbufs_pci(drm_device_t * dev, struct drm_buf_desc * request); 937extern int drm_addbufs_pci(struct drm_device *dev, struct drm_buf_desc * request);
938extern int drm_addmap(drm_device_t * dev, unsigned int offset, 938extern int drm_addmap(struct drm_device *dev, unsigned int offset,
939 unsigned int size, enum drm_map_type type, 939 unsigned int size, enum drm_map_type type,
940 enum drm_map_flags flags, drm_local_map_t ** map_ptr); 940 enum drm_map_flags flags, drm_local_map_t ** map_ptr);
941extern int drm_addmap_ioctl(struct inode *inode, struct file *filp, 941extern int drm_addmap_ioctl(struct inode *inode, struct file *filp,
942 unsigned int cmd, unsigned long arg); 942 unsigned int cmd, unsigned long arg);
943extern int drm_rmmap(drm_device_t * dev, drm_local_map_t * map); 943extern int drm_rmmap(struct drm_device *dev, drm_local_map_t * map);
944extern int drm_rmmap_locked(drm_device_t * dev, drm_local_map_t * map); 944extern int drm_rmmap_locked(struct drm_device *dev, drm_local_map_t * map);
945extern int drm_rmmap_ioctl(struct inode *inode, struct file *filp, 945extern int drm_rmmap_ioctl(struct inode *inode, struct file *filp,
946 unsigned int cmd, unsigned long arg); 946 unsigned int cmd, unsigned long arg);
947 947
@@ -956,56 +956,56 @@ extern int drm_freebufs(struct inode *inode, struct file *filp,
956 unsigned int cmd, unsigned long arg); 956 unsigned int cmd, unsigned long arg);
957extern int drm_mapbufs(struct inode *inode, struct file *filp, 957extern int drm_mapbufs(struct inode *inode, struct file *filp,
958 unsigned int cmd, unsigned long arg); 958 unsigned int cmd, unsigned long arg);
959extern unsigned long drm_get_resource_start(drm_device_t * dev, 959extern unsigned long drm_get_resource_start(struct drm_device *dev,
960 unsigned int resource); 960 unsigned int resource);
961extern unsigned long drm_get_resource_len(drm_device_t * dev, 961extern unsigned long drm_get_resource_len(struct drm_device *dev,
962 unsigned int resource); 962 unsigned int resource);
963 963
964 /* DMA support (drm_dma.h) */ 964 /* DMA support (drm_dma.h) */
965extern int drm_dma_setup(drm_device_t * dev); 965extern int drm_dma_setup(struct drm_device *dev);
966extern void drm_dma_takedown(drm_device_t * dev); 966extern void drm_dma_takedown(struct drm_device *dev);
967extern void drm_free_buffer(drm_device_t * dev, drm_buf_t * buf); 967extern void drm_free_buffer(struct drm_device *dev, drm_buf_t * buf);
968extern void drm_core_reclaim_buffers(drm_device_t * dev, struct file *filp); 968extern void drm_core_reclaim_buffers(struct drm_device *dev, struct file *filp);
969 969
970 /* IRQ support (drm_irq.h) */ 970 /* IRQ support (drm_irq.h) */
971extern int drm_control(struct inode *inode, struct file *filp, 971extern int drm_control(struct inode *inode, struct file *filp,
972 unsigned int cmd, unsigned long arg); 972 unsigned int cmd, unsigned long arg);
973extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS); 973extern irqreturn_t drm_irq_handler(DRM_IRQ_ARGS);
974extern int drm_irq_uninstall(drm_device_t * dev); 974extern int drm_irq_uninstall(struct drm_device *dev);
975extern void drm_driver_irq_preinstall(drm_device_t * dev); 975extern void drm_driver_irq_preinstall(struct drm_device *dev);
976extern void drm_driver_irq_postinstall(drm_device_t * dev); 976extern void drm_driver_irq_postinstall(struct drm_device *dev);
977extern void drm_driver_irq_uninstall(drm_device_t * dev); 977extern void drm_driver_irq_uninstall(struct drm_device *dev);
978 978
979extern int drm_wait_vblank(struct inode *inode, struct file *filp, 979extern int drm_wait_vblank(struct inode *inode, struct file *filp,
980 unsigned int cmd, unsigned long arg); 980 unsigned int cmd, unsigned long arg);
981extern int drm_vblank_wait(drm_device_t * dev, unsigned int *vbl_seq); 981extern int drm_vblank_wait(struct drm_device *dev, unsigned int *vbl_seq);
982extern void drm_vbl_send_signals(drm_device_t * dev); 982extern void drm_vbl_send_signals(struct drm_device *dev);
983extern void drm_locked_tasklet(drm_device_t *dev, void(*func)(drm_device_t*)); 983extern void drm_locked_tasklet(struct drm_device *dev, void(*func)(struct drm_device*));
984 984
985 /* AGP/GART support (drm_agpsupport.h) */ 985 /* AGP/GART support (drm_agpsupport.h) */
986extern drm_agp_head_t *drm_agp_init(drm_device_t * dev); 986extern drm_agp_head_t *drm_agp_init(struct drm_device *dev);
987extern int drm_agp_acquire(drm_device_t * dev); 987extern int drm_agp_acquire(struct drm_device *dev);
988extern int drm_agp_acquire_ioctl(struct inode *inode, struct file *filp, 988extern int drm_agp_acquire_ioctl(struct inode *inode, struct file *filp,
989 unsigned int cmd, unsigned long arg); 989 unsigned int cmd, unsigned long arg);
990extern int drm_agp_release(drm_device_t * dev); 990extern int drm_agp_release(struct drm_device *dev);
991extern int drm_agp_release_ioctl(struct inode *inode, struct file *filp, 991extern int drm_agp_release_ioctl(struct inode *inode, struct file *filp,
992 unsigned int cmd, unsigned long arg); 992 unsigned int cmd, unsigned long arg);
993extern int drm_agp_enable(drm_device_t * dev, struct drm_agp_mode mode); 993extern int drm_agp_enable(struct drm_device *dev, struct drm_agp_mode mode);
994extern int drm_agp_enable_ioctl(struct inode *inode, struct file *filp, 994extern int drm_agp_enable_ioctl(struct inode *inode, struct file *filp,
995 unsigned int cmd, unsigned long arg); 995 unsigned int cmd, unsigned long arg);
996extern int drm_agp_info(drm_device_t * dev, struct drm_agp_info * info); 996extern int drm_agp_info(struct drm_device *dev, struct drm_agp_info * info);
997extern int drm_agp_info_ioctl(struct inode *inode, struct file *filp, 997extern int drm_agp_info_ioctl(struct inode *inode, struct file *filp,
998 unsigned int cmd, unsigned long arg); 998 unsigned int cmd, unsigned long arg);
999extern int drm_agp_alloc(drm_device_t *dev, struct drm_agp_buffer *request); 999extern int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request);
1000extern int drm_agp_alloc_ioctl(struct inode *inode, struct file *filp, 1000extern int drm_agp_alloc_ioctl(struct inode *inode, struct file *filp,
1001 unsigned int cmd, unsigned long arg); 1001 unsigned int cmd, unsigned long arg);
1002extern int drm_agp_free(drm_device_t *dev, struct drm_agp_buffer *request); 1002extern int drm_agp_free(struct drm_device *dev, struct drm_agp_buffer *request);
1003extern int drm_agp_free_ioctl(struct inode *inode, struct file *filp, 1003extern int drm_agp_free_ioctl(struct inode *inode, struct file *filp,
1004 unsigned int cmd, unsigned long arg); 1004 unsigned int cmd, unsigned long arg);
1005extern int drm_agp_unbind(drm_device_t *dev, struct drm_agp_binding *request); 1005extern int drm_agp_unbind(struct drm_device *dev, struct drm_agp_binding *request);
1006extern int drm_agp_unbind_ioctl(struct inode *inode, struct file *filp, 1006extern int drm_agp_unbind_ioctl(struct inode *inode, struct file *filp,
1007 unsigned int cmd, unsigned long arg); 1007 unsigned int cmd, unsigned long arg);
1008extern int drm_agp_bind(drm_device_t *dev, struct drm_agp_binding *request); 1008extern int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request);
1009extern int drm_agp_bind_ioctl(struct inode *inode, struct file *filp, 1009extern int drm_agp_bind_ioctl(struct inode *inode, struct file *filp,
1010 unsigned int cmd, unsigned long arg); 1010 unsigned int cmd, unsigned long arg);
1011extern 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,
@@ -1017,18 +1017,18 @@ extern int drm_agp_unbind_memory(DRM_AGP_MEM * handle);
1017 /* Stub support (drm_stub.h) */ 1017 /* Stub support (drm_stub.h) */
1018extern int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, 1018extern int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
1019 struct drm_driver *driver); 1019 struct drm_driver *driver);
1020extern int drm_put_dev(drm_device_t * dev); 1020extern int drm_put_dev(struct drm_device *dev);
1021extern int drm_put_head(drm_head_t * head); 1021extern int drm_put_head(struct drm_head *head);
1022extern unsigned int drm_debug; 1022extern unsigned int drm_debug;
1023extern unsigned int drm_cards_limit; 1023extern unsigned int drm_cards_limit;
1024extern drm_head_t **drm_heads; 1024extern struct drm_head **drm_heads;
1025extern struct class *drm_class; 1025extern struct class *drm_class;
1026extern struct proc_dir_entry *drm_proc_root; 1026extern struct proc_dir_entry *drm_proc_root;
1027 1027
1028extern drm_local_map_t *drm_getsarea(struct drm_device *dev); 1028extern drm_local_map_t *drm_getsarea(struct drm_device *dev);
1029 1029
1030 /* Proc support (drm_proc.h) */ 1030 /* Proc support (drm_proc.h) */
1031extern int drm_proc_init(drm_device_t * dev, 1031extern int drm_proc_init(struct drm_device *dev,
1032 int minor, 1032 int minor,
1033 struct proc_dir_entry *root, 1033 struct proc_dir_entry *root,
1034 struct proc_dir_entry **dev_root); 1034 struct proc_dir_entry **dev_root);
@@ -1044,21 +1044,21 @@ extern int drm_sg_free(struct inode *inode, struct file *filp,
1044 unsigned int cmd, unsigned long arg); 1044 unsigned int cmd, unsigned long arg);
1045 1045
1046 /* ATI PCIGART support (ati_pcigart.h) */ 1046 /* ATI PCIGART support (ati_pcigart.h) */
1047extern int drm_ati_pcigart_init(drm_device_t * dev, 1047extern int drm_ati_pcigart_init(struct drm_device *dev,
1048 drm_ati_pcigart_info * gart_info); 1048 drm_ati_pcigart_info * gart_info);
1049extern int drm_ati_pcigart_cleanup(drm_device_t * dev, 1049extern int drm_ati_pcigart_cleanup(struct drm_device *dev,
1050 drm_ati_pcigart_info * gart_info); 1050 drm_ati_pcigart_info * gart_info);
1051 1051
1052extern drm_dma_handle_t *drm_pci_alloc(drm_device_t * dev, size_t size, 1052extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size,
1053 size_t align, dma_addr_t maxaddr); 1053 size_t align, dma_addr_t maxaddr);
1054extern void __drm_pci_free(drm_device_t * dev, drm_dma_handle_t * dmah); 1054extern void __drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah);
1055extern void drm_pci_free(drm_device_t * dev, drm_dma_handle_t * dmah); 1055extern void drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah);
1056 1056
1057 /* sysfs support (drm_sysfs.c) */ 1057 /* sysfs support (drm_sysfs.c) */
1058extern struct class *drm_sysfs_create(struct module *owner, char *name); 1058extern struct class *drm_sysfs_create(struct module *owner, char *name);
1059extern void drm_sysfs_destroy(struct class *cs); 1059extern void drm_sysfs_destroy(struct class *cs);
1060extern struct class_device *drm_sysfs_device_add(struct class *cs, 1060extern struct class_device *drm_sysfs_device_add(struct class *cs,
1061 drm_head_t *head); 1061 struct drm_head *head);
1062extern void drm_sysfs_device_remove(struct class_device *class_dev); 1062extern void drm_sysfs_device_remove(struct class_device *class_dev);
1063 1063
1064/* 1064/*
@@ -1090,7 +1090,7 @@ static __inline__ struct drm_map *drm_core_findmap(struct drm_device *dev,
1090 return NULL; 1090 return NULL;
1091} 1091}
1092 1092
1093static __inline__ int drm_device_is_agp(drm_device_t * dev) 1093static __inline__ int drm_device_is_agp(struct drm_device *dev)
1094{ 1094{
1095 if (dev->driver->device_is_agp != NULL) { 1095 if (dev->driver->device_is_agp != NULL) {
1096 int err = (*dev->driver->device_is_agp) (dev); 1096 int err = (*dev->driver->device_is_agp) (dev);
@@ -1103,7 +1103,7 @@ static __inline__ int drm_device_is_agp(drm_device_t * dev)
1103 return pci_find_capability(dev->pdev, PCI_CAP_ID_AGP); 1103 return pci_find_capability(dev->pdev, PCI_CAP_ID_AGP);
1104} 1104}
1105 1105
1106static __inline__ int drm_device_is_pcie(drm_device_t * dev) 1106static __inline__ int drm_device_is_pcie(struct drm_device *dev)
1107{ 1107{
1108 return pci_find_capability(dev->pdev, PCI_CAP_ID_EXP); 1108 return pci_find_capability(dev->pdev, PCI_CAP_ID_EXP);
1109} 1109}