diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 4e9ae52ef9fdbf39d6ea2e88e642d6065e202cfc..46c0fcfcb7a05d345c7b7b5f1a7c1607b5905e12 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -600,7 +600,7 @@ int amdgpu_bo_create(struct amdgpu_device *adev,
 		/* For GPUs without spatial partitioning */
 		bo->xcp_id = 0;
 
-	if (!amdgpu_bo_support_uswc(bo->flags))
+	if (!amdgpu_bo_support_uswc(bo->flags) || !(bp->domain & AMDGPU_GEM_DOMAIN_VRAM))
 		bo->flags &= ~AMDGPU_GEM_CREATE_CPU_GTT_USWC;
 
 	if (adev->ras_enabled)