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

Commit 367bbd49 authored by Rob Clark's avatar Rob Clark Committed by Dave Airlie
Browse files

drm/gem: add drm_gem_create_mmap_offset_size() 



Variant of drm_gem_create_mmap_offset() which doesn't make the
assumption that virtual size and physical size (obj->size) are the same.
This is needed in omapdrm to deal with tiled buffers.  And lets us get
rid of a duplicated and slightly modified version of
drm_gem_create_mmap_offset() in omapdrm.

Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
Reviewed-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 5833bd2f

drivers/gpu/drm/drm_gem.c

+24 −4
Original line number Diff line number Diff line
@@ -317,24 +317,44 @@ drm_gem_free_mmap_offset(struct drm_gem_object *obj) 
EXPORT_SYMBOL(drm_gem_free_mmap_offset);



/**

 * drm_gem_create_mmap_offset - create a fake mmap offset for an object

 * drm_gem_create_mmap_offset_size - create a fake mmap offset for an object

 * @obj: obj in question

 * @size: the virtual size

 *

 * GEM memory mapping works by handing back to userspace a fake mmap offset

 * it can use in a subsequent mmap(2) call.  The DRM core code then looks

 * up the object based on the offset and sets up the various memory mapping

 * structures.

 *

 * This routine allocates and attaches a fake offset for @obj.

 * This routine allocates and attaches a fake offset for @obj, in cases where

 * the virtual size differs from the physical size (ie. obj->size).  Otherwise

 * just use drm_gem_create_mmap_offset().

 */

int

drm_gem_create_mmap_offset(struct drm_gem_object *obj)

drm_gem_create_mmap_offset_size(struct drm_gem_object *obj, size_t size)

{

	struct drm_device *dev = obj->dev;

	struct drm_gem_mm *mm = dev->mm_private;



	return drm_vma_offset_add(&mm->vma_manager, &obj->vma_node,

				  obj->size / PAGE_SIZE);

				  size / PAGE_SIZE);

}

EXPORT_SYMBOL(drm_gem_create_mmap_offset_size);



/**

 * drm_gem_create_mmap_offset - create a fake mmap offset for an object

 * @obj: obj in question

 *

 * GEM memory mapping works by handing back to userspace a fake mmap offset

 * it can use in a subsequent mmap(2) call.  The DRM core code then looks

 * up the object based on the offset and sets up the various memory mapping

 * structures.

 *

 * This routine allocates and attaches a fake offset for @obj.

 */

int drm_gem_create_mmap_offset(struct drm_gem_object *obj)

{

	return drm_gem_create_mmap_offset_size(obj, obj->size);

}

EXPORT_SYMBOL(drm_gem_create_mmap_offset);

include/drm/drmP.h

+1 −0
Original line number Diff line number Diff line
@@ -1614,6 +1614,7 @@ drm_gem_object_handle_unreference_unlocked(struct drm_gem_object *obj) 


void drm_gem_free_mmap_offset(struct drm_gem_object *obj);

int drm_gem_create_mmap_offset(struct drm_gem_object *obj);

int drm_gem_create_mmap_offset_size(struct drm_gem_object *obj, size_t size);



struct drm_gem_object *drm_gem_object_lookup(struct drm_device *dev,

					     struct drm_file *filp,