Revert "drm/amdgpu: Don't change preferred domian when fallback GTT v5"

This reverts commit bbaf1871ea1d7b7021e350a3e8bb1ec8408c2030.

Felix reports this commit causes regression.

Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

2 files changed, 17 insertions, 17 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 28c2706e48d7..46b9ea4e6103 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -56,11 +56,23 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size,
                 alignment = PAGE_SIZE;
         }
 
+retry:
         r = amdgpu_bo_create(adev, size, alignment, initial_domain,
                              flags, type, resv, &bo);
         if (r) {
-                DRM_DEBUG("Failed to allocate GEM object (%ld, %d, %u, %d)\n",
-                          size, initial_domain, alignment, r);
+                if (r != -ERESTARTSYS) {
+                        if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) {
+                                flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;
+                                goto retry;
+                        }
+
+                        if (initial_domain == AMDGPU_GEM_DOMAIN_VRAM) {
+                                initial_domain |= AMDGPU_GEM_DOMAIN_GTT;
+                                goto retry;
+                        }
+                        DRM_DEBUG("Failed to allocate GEM object (%ld, %d, %u, %d)\n",
+                                  size, initial_domain, alignment, r);
+                }
                 return r;
         }
         *obj = &bo->gem_base;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 5ad985c40d49..6d08cde8443c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -356,7 +356,6 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, unsigned long size,
         struct amdgpu_bo *bo;
         unsigned long page_align;
         size_t acc_size;
-        u32 domains;
         int r;
 
         page_align = roundup(byte_align, PAGE_SIZE) >> PAGE_SHIFT;
@@ -418,23 +417,12 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev, unsigned long size,
 #endif
 
         bo->tbo.bdev = &adev->mman.bdev;
-        domains = bo->preferred_domains;
-retry:
-        amdgpu_ttm_placement_from_domain(bo, domains);
+        amdgpu_ttm_placement_from_domain(bo, domain);
+
         r = ttm_bo_init_reserved(&adev->mman.bdev, &bo->tbo, size, type,
                                  &bo->placement, page_align, &ctx, acc_size,
                                  NULL, resv, &amdgpu_ttm_bo_destroy);
-
-        if (unlikely(r && r != -ERESTARTSYS)) {
-                if (bo->flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) {
-                        bo->flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;
-                        goto retry;
-                } else if (domains != bo->allowed_domains) {
-                        domains = bo->allowed_domains;
-                        goto retry;
-                }
-        }
-        if (unlikely(r))
+        if (unlikely(r != 0))
                 return r;
 
         if (adev->gmc.visible_vram_size < adev->gmc.real_vram_size &&