diff options
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drmP.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 03a7c11cb24d..c91fbb68b460 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -526,7 +526,7 @@ struct drm_mm { | |||
526 | * Kernel side of a mapping | 526 | * Kernel side of a mapping |
527 | */ | 527 | */ |
528 | struct drm_local_map { | 528 | struct drm_local_map { |
529 | unsigned long offset; /**< Requested physical address (0 for SAREA)*/ | 529 | resource_size_t offset; /**< Requested physical address (0 for SAREA)*/ |
530 | unsigned long size; /**< Requested physical size (bytes) */ | 530 | unsigned long size; /**< Requested physical size (bytes) */ |
531 | enum drm_map_type type; /**< Type of memory to map */ | 531 | enum drm_map_type type; /**< Type of memory to map */ |
532 | enum drm_map_flags flags; /**< Flags */ | 532 | enum drm_map_flags flags; /**< Flags */ |
@@ -760,8 +760,8 @@ struct drm_driver { | |||
760 | struct drm_file *file_priv); | 760 | struct drm_file *file_priv); |
761 | void (*reclaim_buffers_idlelocked) (struct drm_device *dev, | 761 | void (*reclaim_buffers_idlelocked) (struct drm_device *dev, |
762 | struct drm_file *file_priv); | 762 | struct drm_file *file_priv); |
763 | unsigned long (*get_map_ofs) (struct drm_local_map * map); | 763 | resource_size_t (*get_map_ofs) (struct drm_local_map * map); |
764 | unsigned long (*get_reg_ofs) (struct drm_device *dev); | 764 | resource_size_t (*get_reg_ofs) (struct drm_device *dev); |
765 | void (*set_version) (struct drm_device *dev, | 765 | void (*set_version) (struct drm_device *dev, |
766 | struct drm_set_version *sv); | 766 | struct drm_set_version *sv); |
767 | 767 | ||
@@ -1062,8 +1062,8 @@ extern int drm_release(struct inode *inode, struct file *filp); | |||
1062 | extern int drm_mmap(struct file *filp, struct vm_area_struct *vma); | 1062 | extern int drm_mmap(struct file *filp, struct vm_area_struct *vma); |
1063 | extern int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma); | 1063 | extern int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma); |
1064 | extern void drm_vm_open_locked(struct vm_area_struct *vma); | 1064 | extern void drm_vm_open_locked(struct vm_area_struct *vma); |
1065 | extern unsigned long drm_core_get_map_ofs(struct drm_local_map * map); | 1065 | extern resource_size_t drm_core_get_map_ofs(struct drm_local_map * map); |
1066 | extern unsigned long drm_core_get_reg_ofs(struct drm_device *dev); | 1066 | extern resource_size_t drm_core_get_reg_ofs(struct drm_device *dev); |
1067 | extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait); | 1067 | extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait); |
1068 | 1068 | ||
1069 | /* Memory management support (drm_memory.h) */ | 1069 | /* Memory management support (drm_memory.h) */ |
@@ -1166,7 +1166,7 @@ extern int drm_i_have_hw_lock(struct drm_device *dev, struct drm_file *file_priv | |||
1166 | /* Buffer management support (drm_bufs.h) */ | 1166 | /* Buffer management support (drm_bufs.h) */ |
1167 | extern int drm_addbufs_agp(struct drm_device *dev, struct drm_buf_desc * request); | 1167 | extern int drm_addbufs_agp(struct drm_device *dev, struct drm_buf_desc * request); |
1168 | extern int drm_addbufs_pci(struct drm_device *dev, struct drm_buf_desc * request); | 1168 | extern int drm_addbufs_pci(struct drm_device *dev, struct drm_buf_desc * request); |
1169 | extern int drm_addmap(struct drm_device *dev, unsigned int offset, | 1169 | extern int drm_addmap(struct drm_device *dev, resource_size_t offset, |
1170 | unsigned int size, enum drm_map_type type, | 1170 | unsigned int size, enum drm_map_type type, |
1171 | enum drm_map_flags flags, struct drm_local_map **map_ptr); | 1171 | enum drm_map_flags flags, struct drm_local_map **map_ptr); |
1172 | extern int drm_addmap_ioctl(struct drm_device *dev, void *data, | 1172 | extern int drm_addmap_ioctl(struct drm_device *dev, void *data, |