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

Commit 2a84a447 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/radeon: add userptr flag to directly validate the BO to GTT 



This way we test userptr availability at BO creation time instead of first use.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ddd00e33

drivers/gpu/drm/radeon/radeon_gem.c

+17 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ int radeon_gem_userptr_ioctl(struct drm_device *dev, void *data, 


	/* reject unknown flag values */

	if (args->flags & ~(RADEON_GEM_USERPTR_READONLY |

	    RADEON_GEM_USERPTR_ANONONLY))

	    RADEON_GEM_USERPTR_ANONONLY | RADEON_GEM_USERPTR_VALIDATE))

		return -EINVAL;



	/* readonly pages not tested on older hardware */
@@ -312,6 +312,22 @@ int radeon_gem_userptr_ioctl(struct drm_device *dev, void *data, 
	if (r)

		goto release_object;



	if (args->flags & RADEON_GEM_USERPTR_VALIDATE) {

		down_read(&current->mm->mmap_sem);

		r = radeon_bo_reserve(bo, true);

		if (r) {

			up_read(&current->mm->mmap_sem);

			goto release_object;

		}



		radeon_ttm_placement_from_domain(bo, RADEON_GEM_DOMAIN_GTT);

		r = ttm_bo_validate(&bo->tbo, &bo->placement, true, false);

		radeon_bo_unreserve(bo);

		up_read(&current->mm->mmap_sem);

		if (r)

			goto release_object;

	}



	r = drm_gem_handle_create(filp, gobj, &handle);

	/* drop reference from allocate - handle holds it now */

	drm_gem_object_unreference_unlocked(gobj);

include/uapi/drm/radeon_drm.h

+1 −0
Original line number Diff line number Diff line
@@ -817,6 +817,7 @@ struct drm_radeon_gem_create { 
 */

#define RADEON_GEM_USERPTR_READONLY	(1 << 0)

#define RADEON_GEM_USERPTR_ANONONLY	(1 << 1)

#define RADEON_GEM_USERPTR_VALIDATE	(1 << 2)



struct drm_radeon_gem_userptr {

	uint64_t		addr;