1 files changed, 17 insertions, 5 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index e87eedcc0da9..eb75eb44efc6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -72,7 +72,7 @@ retry:
                                 initial_domain |= AMDGPU_GEM_DOMAIN_GTT;
                                 goto retry;
                         }
-                        DRM_ERROR("Failed to allocate GEM object (%ld, %d, %u, %d)\n",
+                        DRM_DEBUG("Failed to allocate GEM object (%ld, %d, %u, %d)\n",
                                   size, initial_domain, alignment, r);
                 }
                 return r;
@@ -282,6 +282,7 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data,
 int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
                              struct drm_file *filp)
 {
+        struct ttm_operation_ctx ctx = { true, false };
         struct amdgpu_device *adev = dev->dev_private;
         struct drm_amdgpu_gem_userptr *args = data;
         struct drm_gem_object *gobj;
@@ -335,7 +336,7 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data,
                         goto free_pages;
 
                 amdgpu_ttm_placement_from_domain(bo, AMDGPU_GEM_DOMAIN_GTT);
-                r = ttm_bo_validate(&bo->tbo, &bo->placement, true, false);
+                r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
                 amdgpu_bo_unreserve(bo);
                 if (r)
                         goto free_pages;
@@ -557,14 +558,25 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
         int r = 0;
 
         if (args->va_address < AMDGPU_VA_RESERVED_SIZE) {
-                dev_err(&dev->pdev->dev,
+                dev_dbg(&dev->pdev->dev,
                         "va_address 0x%LX is in reserved area 0x%LX\n",
                         args->va_address, AMDGPU_VA_RESERVED_SIZE);
                 return -EINVAL;
         }
 
+        if (args->va_address >= AMDGPU_VA_HOLE_START &&
+            args->va_address < AMDGPU_VA_HOLE_END) {
+                dev_dbg(&dev->pdev->dev,
+                        "va_address 0x%LX is in VA hole 0x%LX-0x%LX\n",
+                        args->va_address, AMDGPU_VA_HOLE_START,
+                        AMDGPU_VA_HOLE_END);
+                return -EINVAL;
+        }
+
+        args->va_address &= AMDGPU_VA_HOLE_MASK;
+
         if ((args->flags & ~valid_flags) && (args->flags & ~prt_flags)) {
-                dev_err(&dev->pdev->dev, "invalid flags combination 0x%08X\n",
+                dev_dbg(&dev->pdev->dev, "invalid flags combination 0x%08X\n",
                         args->flags);
                 return -EINVAL;
         }
@@ -576,7 +588,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
         case AMDGPU_VA_OP_REPLACE:
                 break;
         default:
-                dev_err(&dev->pdev->dev, "unsupported operation %d\n",
+                dev_dbg(&dev->pdev->dev, "unsupported operation %d\n",
                         args->operation);
                 return -EINVAL;
         }