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: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

2 files changed, 18 insertions, 1 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index 032736b429bf..450656027aba 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -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);
diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h
index 9720e1a36848..5dc61c2d4c73 100644
--- a/include/uapi/drm/radeon_drm.h
+++ b/include/uapi/drm/radeon_drm.h
@@ -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;