1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 04d6830347ec..9e23d6f6f3f3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -388,6 +388,8 @@ retry:
         drm_gem_private_object_init(adev->ddev, &bo->gem_base, size);
         INIT_LIST_HEAD(&bo->shadow_list);
         INIT_LIST_HEAD(&bo->va);
+        bo->preferred_domains = preferred_domains;
+        bo->allowed_domains = allowed_domains;
 
         bo->flags = flags;
 
@@ -424,7 +426,8 @@ retry:
         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) && type == ttm_bo_type_device) {
+        if (unlikely(r && r != -ERESTARTSYS) && type == ttm_bo_type_device &&
+            !(flags & AMDGPU_GEM_CREATE_NO_FALLBACK)) {
                 if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) {
                         flags &= ~AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;
                         goto retry;