1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 93b2c5a48a71..30493429851e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -495,7 +495,11 @@ static int amdgpu_bo_do_create(struct amdgpu_device *adev,
 #endif
 
         bo->tbo.bdev = &adev->mman.bdev;
-        amdgpu_bo_placement_from_domain(bo, bp->domain);
+        if (bp->domain & (AMDGPU_GEM_DOMAIN_GWS | AMDGPU_GEM_DOMAIN_OA |
+                          AMDGPU_GEM_DOMAIN_GDS))
+                amdgpu_bo_placement_from_domain(bo, AMDGPU_GEM_DOMAIN_CPU);
+        else
+                amdgpu_bo_placement_from_domain(bo, bp->domain);
         if (bp->type == ttm_bo_type_kernel)
                 bo->tbo.priority = 1;