drm: Split drm_map and drm_local_map
Subsystems (3)
PATCH 2/3 drm: Split drm_map and drm_local_map
Once upon a time, the DRM made the distinction between the drm_map data structure exchanged with user space and the drm_local_map used in the kernel.
For some reasons, while the BSD port still has that "feature", the linux part abused drm_map for kernel internal usage as the local map only existed as a typedef of the struct drm_map.
This patch fixes it by declaring struct drm_local_map separately (though its content is currently identical to the userspace variant), and changing the kernel code to only use that, except when it's a user<->kernel interface (ie. ioctl).
This allows subsequent changes to the in-kernel format
I've also replaced the use of drm_local_map_t with struct drm_local_map in a couple of places. Mostly by accident but they are the same (the former is a typedef of the later) and I have some remote plans and half finished patch to completely kill the drm_local_map_t typedef so I left those bits in.
---
drivers/gpu/drm/drm_bufs.c | 46 ++++++++++++++++++++++----------------- drivers/gpu/drm/drm_context.c | 4 +-- drivers/gpu/drm/drm_drv.c | 2 - drivers/gpu/drm/drm_gem.c | 2 - drivers/gpu/drm/drm_memory.c | 6 ++--- drivers/gpu/drm/drm_proc.c | 2 - drivers/gpu/drm/drm_vm.c | 12 +++++----- drivers/gpu/drm/i810/i810_drv.h | 4 +-- drivers/gpu/drm/i830/i830_drv.h | 4 +-- drivers/gpu/drm/i915/i915_gem.c | 4 +-- include/drm/drmP.h | 47 +++++++++++++++++++++++++--------------- 11 files changed, 76 insertions(+), 57 deletions(-)
drivers/gpu/drm/drm_bufs.c +26 -20
@@ -50,7 +50,7 @@ resource_size_t drm_get_resource_len(strEXPORT_SYMBOL (drm_get_resource_len);static struct drm_map_list *drm_find_matching_map (struct drm_device *dev, -drm_local_map_t *map) +struct drm_local_map *map) {struct drm_map_list *entry;list_for_each_entry (entry, &dev->maplist, head) {
@@ -89,13 +89,8 @@ static int drm_map_handle(struct drm_dev }/** -* Ioctl to specify a range of memory that is available for mapping by a non-root process. -* -* \param inode device inode. -* \param file_priv DRM file private. -* \param cmd command. -* \param arg pointer to a drm_map structure. -* \return zero on success or a negative value on error. +* Core function to create a range of memory available for mapping by a +* non-root process. * * Adjusts the memory offset to its absolute value according to the mapping * type. Adds the map to the map list drm_device::maplist. Adds MTRR's where
@@ -106,7 +101,7 @@ static int drm_addmap_core(struct drm_deenum drm_map_flags flags, struct drm_map_list ** maplist) { - struct drm_map *map; + struct drm_local_map *map;struct drm_map_list *list;drm_dma_handle_t *dmah;unsigned long user_token;
@@ -329,7 +324,7 @@ static int drm_addmap_core(struct drm_deint drm_addmap (struct drm_device * dev,unsigned int offset,unsigned int size,enum drm_map_type type, -enum drm_map_flags flags,drm_local_map_t ** map_ptr) +enum drm_map_flags flags,struct drm_local_map ** map_ptr) {struct drm_map_list *list;int rc;
@@ -342,6 +337,17 @@ int drm_addmap(struct drm_device * dev,EXPORT_SYMBOL (drm_addmap); +/** +* Ioctl to specify a range of memory that is available for mapping by a +* non-root process. +* +* \param inode device inode. +* \param file_priv DRM file private. +* \param cmd command. +* \param arg pointer to a drm_map structure. +* \return zero on success or a negative value on error. +* +*/ int drm_addmap_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv) {
@@ -367,19 +373,13 @@ int drm_addmap_ioctl(struct drm_device ** Remove a map private from list and deallocate resources if the mapping * isn't in use. * -* \param inode device inode. -* \param file_priv DRM file private. -* \param cmd command. -* \param arg pointer to a struct drm_map structure. -* \return zero on success or a negative value on error. -* * Searches the map on drm_device::maplist, removes it from the list, see if * its being used, and free any associate resource (such as MTRR's) if it's not * being on use. * * \sa drm_addmap */ -int drm_rmmap_locked (struct drm_device *dev,drm_local_map_t *map) +int drm_rmmap_locked (struct drm_device *dev,struct drm_local_map *map) {struct drm_map_list *r_list =NULL , *list_t;drm_dma_handle_t dmah;
@@ -442,7 +442,7 @@ int drm_rmmap_locked(struct drm_device * }EXPORT_SYMBOL (drm_rmmap_locked); -int drm_rmmap (struct drm_device *dev,drm_local_map_t *map) +int drm_rmmap (struct drm_device *dev,struct drm_local_map *map) {int ret;
@@ -462,12 +462,18 @@ EXPORT_SYMBOL(drm_rmmap);* One use case might be after addmap is allowed for normal users for SHM and * gets used by drivers that the server doesn't need to care about. This seems * unlikely. +* +* \param inode device inode. +* \param file_priv DRM file private. +* \param cmd command. +* \param arg pointer to a struct drm_map structure. +* \return zero on success or a negative value on error. */ int drm_rmmap_ioctl (struct drm_device *dev,void *data,struct drm_file *file_priv) {struct drm_map *request = data; -drm_local_map_t *map =NULL ; +struct drm_local_map *map =NULL ;struct drm_map_list *r_list;int ret;
@@ -1534,7 +1540,7 @@ int drm_mapbufs(struct drm_device *dev, && (dma->flags & _DRM_DMA_USE_SG)) || (drm_core_check_feature(dev, DRIVER_FB_DMA) && (dma->flags & _DRM_DMA_USE_FB))) { -struct drm_map *map = dev->agp_buffer_map; +struct drm_local_map *map = dev->agp_buffer_map;unsigned long token = dev->agp_buffer_token;if (!map) {
drivers/gpu/drm/drm_context.c +2 -2
@@ -143,7 +143,7 @@ int drm_getsareactx(struct drm_device *d struct drm_file *file_priv) {struct drm_ctx_priv_map *request = data; -struct drm_map *map; +struct drm_local_map *map;struct drm_map_list *_entry;mutex_lock (&dev->struct_mutex);
@@ -186,7 +186,7 @@ int drm_setsareactx(struct drm_device *d struct drm_file *file_priv) {struct drm_ctx_priv_map *request = data; -struct drm_map *map =NULL ; +struct drm_local_map *map =NULL ;struct drm_map_list *r_list =NULL ;mutex_lock (&dev->struct_mutex);
drivers/gpu/drm/drm_drv.c +1 -1
@@ -530,7 +530,7 @@ int drm_ioctl(struct inode *inode, strucEXPORT_SYMBOL (drm_ioctl); -drm_local_map_t *drm_getsarea (struct drm_device *dev) +struct drm_local_map *drm_getsarea (struct drm_device *dev) {struct drm_map_list *entry;
drivers/gpu/drm/drm_gem.c +1 -1
@@ -479,7 +479,7 @@ int drm_gem_mmap(struct file *filp, strustruct drm_file *priv = filp->private_data;struct drm_device *dev = priv->minor->dev;struct drm_gem_mm *mm = dev->mm_private; -struct drm_map *map =NULL ; +struct drm_local_map *map =NULL ;struct drm_gem_object *obj;struct drm_hash_item *hash;unsigned long prot;
drivers/gpu/drm/drm_memory.c +3 -3
@@ -159,7 +159,7 @@ static inline void *agp_remap(unsigned l#endif /* debug_memory */ -void drm_core_ioremap (struct drm_map *map,struct drm_device *dev) +void drm_core_ioremap (struct drm_local_map *map,struct drm_device *dev) {if (drm_core_has_AGP (dev) && dev->agp && dev->agp->cant_use_aperture && map->type == _DRM_AGP)
@@ -169,12 +169,12 @@ void drm_core_ioremap(struct drm_map *ma }EXPORT_SYMBOL (drm_core_ioremap); -void drm_core_ioremap_wc (struct drm_map *map,struct drm_device *dev) +void drm_core_ioremap_wc (struct drm_local_map *map,struct drm_device *dev) { map->handle =ioremap_wc (map->offset, map->size); }EXPORT_SYMBOL (drm_core_ioremap_wc); -void drm_core_ioremapfree (struct drm_map *map,struct drm_device *dev) +void drm_core_ioremapfree (struct drm_local_map *map,struct drm_device *dev) {if (!map->handle || !map->size)return ;
drivers/gpu/drm/drm_proc.c +1 -1
@@ -247,7 +247,7 @@ static int drm__vm_info(char *buf, charstruct drm_minor *minor = (struct drm_minor *) data;struct drm_device *dev = minor->dev;int len =0 ; -struct drm_map *map; +struct drm_local_map *map;struct drm_map_list *r_list;/* Hardcoded from _DRM_FRAME_BUFFER,
drivers/gpu/drm/drm_vm.c +6 -6
@@ -91,7 +91,7 @@ static int drm_do_vm_fault(struct vm_are {struct drm_file *priv = vma->vm_file->private_data;struct drm_device *dev = priv->minor->dev; -struct drm_map *map =NULL ; +struct drm_local_map *map =NULL ;struct drm_map_list *r_list;struct drm_hash_item *hash;
@@ -176,7 +176,7 @@ static int drm_do_vm_fault(struct vm_are*/ static int drm_do_vm_shm_fault (struct vm_area_struct *vma,struct vm_fault *vmf) { -struct drm_map *map = (struct drm_map *) vma->vm_private_data; +struct drm_local_map *map = vma->vm_private_data;unsigned long offset;unsigned long i;struct page *page;
@@ -209,7 +209,7 @@ static void drm_vm_shm_close(struct vm_astruct drm_file *priv = vma->vm_file->private_data;struct drm_device *dev = priv->minor->dev;struct drm_vma_entry *pt, *temp; -struct drm_map *map; +struct drm_local_map *map;struct drm_map_list *r_list;int found_maps =0 ;
@@ -322,7 +322,7 @@ static int drm_do_vm_dma_fault(struct vm*/ static int drm_do_vm_sg_fault (struct vm_area_struct *vma,struct vm_fault *vmf) { -struct drm_map *map = (struct drm_map *) vma->vm_private_data; +struct drm_local_map *map = vma->vm_private_data;struct drm_file *priv = vma->vm_file->private_data;struct drm_device *dev = priv->minor->dev;struct drm_sg_mem *entry = dev->sg;
@@ -512,7 +512,7 @@ static int drm_mmap_dma(struct file *filreturn 0 ; } -unsigned long drm_core_get_map_ofs (struct drm_map * map) +unsigned long drm_core_get_map_ofs (struct drm_local_map * map) {return map->offset; }
@@ -547,7 +547,7 @@ int drm_mmap_locked(struct file *filp, s {struct drm_file *priv = filp->private_data;struct drm_device *dev = priv->minor->dev; -struct drm_map *map =NULL ; +struct drm_local_map *map =NULL ;unsigned long offset =0 ;struct drm_hash_item *hash;
include/drm/drmP.h +30 -17
114 lines not on this page · raw message
drivers/gpu/drm/i810/i810_drv.h +2 -2
@@ -77,8 +77,8 @@ typedef struct _drm_i810_ring_buffer { } drm_i810_ring_buffer_t; typedef struct drm_i810_private { - struct drm_map *sarea_map; - struct drm_map *mmio_map; + struct drm_local_map *sarea_map; + struct drm_local_map *mmio_map; drm_i810_sarea_t *sarea_priv; drm_i810_ring_buffer_t ring;
drivers/gpu/drm/i830/i830_drv.h +2 -2
@@ -84,8 +84,8 @@ typedef struct _drm_i830_ring_buffer { } drm_i830_ring_buffer_t; typedef struct drm_i830_private { - struct drm_map *sarea_map; - struct drm_map *mmio_map; + struct drm_local_map *sarea_map; + struct drm_local_map *mmio_map; drm_i830_sarea_t *sarea_priv; drm_i830_ring_buffer_t ring;
drivers/gpu/drm/i915/i915_gem.c +2 -2
@@ -627,7 +627,7 @@ i915_gem_create_mmap_offset(struct drm_gstruct drm_gem_mm *mm = dev->mm_private;struct drm_i915_gem_object *obj_priv = obj->driver_private;struct drm_map_list *list; -struct drm_map *map; +struct drm_local_map *map;int ret =0 ;/* Set the object up for mmap'ing */
@@ -2857,7 +2857,7 @@ void i915_gem_free_object(struct drm_gemstruct drm_device *dev = obj->dev;struct drm_gem_mm *mm = dev->mm_private;struct drm_map_list *list; -struct drm_map *map; +struct drm_local_map *map;struct drm_i915_gem_object *obj_priv = obj->driver_private;while (obj_priv->pin_count >0 )
Quoted 15 lines · Benjamin Herrenschmidt
Once upon a time, the DRM made the distinction between the
drm_mapdata structure exchanged with user space and thedrm_local_mapused in the kernel.For some reasons, while the BSD port still has that "feature", the linux part abused
drm_mapfor kernel internal usage as the local map only existed as a typedef of the structdrm_map.This patch fixes it by declaring struct
drm_local_mapseparately (though its content is currently identical to the userspace variant), and changing the kernel code to only use that, except when it's a user<->kernel interface (ie. ioctl).This allows subsequent changes to the in-kernel format
Quoted 7 lines
I've also replaced the use of
drm_local_map_twith structdrm_local_mapin a couple of places. Mostly by accident but they are the same (the former is a typedef of the later) and I have some remote plans and half finished patch to completely kill thedrm_local_map_ttypedef so I left those bits in.Signed-off-by Benjamin Herrenschmidt <[email protected]>
Thanks for taking on this mess!
Signature · 2 lines
Eric Anholt [email protected] [email protected]