Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f77d390c authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Dave Airlie
Browse files

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.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent d883f7f1

drivers/gpu/drm/drm_bufs.c

+26 −20
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ resource_size_t drm_get_resource_len(struct drm_device *dev, unsigned int resour 
EXPORT_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_device *dev, struct drm_hash_item *hash, 
}



/**

 * 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_device * dev, unsigned int offset, 
			   enum 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_device * dev, unsigned int offset, 


int 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, unsigned int offset, 


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 *dev, void *data, 
 * 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 *dev, drm_local_map_t *map) 
}

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, void *data, 
			&& (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
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ int drm_getsareactx(struct drm_device *dev, void *data, 
		    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 *dev, void *data, 
		    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
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ int drm_ioctl(struct inode *inode, struct file *filp, 


EXPORT_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
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) 
	struct 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
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static inline void *agp_remap(unsigned long offset, unsigned long size, 


#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,7 +169,7 @@ void drm_core_ioremap(struct drm_map *map, struct drm_device *dev) 
}

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)

{

	if (drm_core_has_AGP(dev) &&

	    dev->agp && dev->agp->cant_use_aperture && map->type == _DRM_AGP)
@@ -179,7 +179,7 @@ void drm_core_ioremap_wc(struct drm_map *map, struct drm_device *dev) 
}

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;