1 files changed, 22 insertions, 1 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index cb89fff863c0..365883d7948d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -295,7 +295,7 @@ void amdgpu_bo_free_kernel(struct amdgpu_bo **bo, u64 *gpu_addr,
         if (*bo == NULL)
                 return;
 
-        if (likely(amdgpu_bo_reserve(*bo, false) == 0)) {
+        if (likely(amdgpu_bo_reserve(*bo, true) == 0)) {
                 if (cpu_addr)
                         amdgpu_bo_kunmap(*bo);
 
@@ -543,6 +543,27 @@ err:
         return r;
 }
 
+int amdgpu_bo_validate(struct amdgpu_bo *bo)
+{
+        uint32_t domain;
+        int r;
+
+        if (bo->pin_count)
+                return 0;
+
+        domain = bo->prefered_domains;
+
+retry:
+        amdgpu_ttm_placement_from_domain(bo, domain);
+        r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false);
+        if (unlikely(r == -ENOMEM) && domain != bo->allowed_domains) {
+                domain = bo->allowed_domains;
+                goto retry;
+        }
+
+        return r;
+}
+
 int amdgpu_bo_restore_from_shadow(struct amdgpu_device *adev,
                                   struct amdgpu_ring *ring,
                                   struct amdgpu_bo *bo,