drm/amdgpu/psp: move TMR to cpu invisible vram region

so that more visible vram can be available for umd.

Reviewed-by: Christian König <christian.koenig@amd.com>.
Signed-off-by: Tianci.Yin <tianci.yin@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

3 files changed, 5 insertions, 5 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 2d07f16f1789..008bf62044b0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -246,8 +246,9 @@ int amdgpu_bo_create_reserved(struct amdgpu_device *adev,
         bp.size = size;
         bp.byte_align = align;
         bp.domain = domain;
-        bp.flags = AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |
-                AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
+        bp.flags = cpu_addr ? AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED
+                : AMDGPU_GEM_CREATE_NO_CPU_ACCESS;
+        bp.flags |= AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
         bp.type = ttm_bo_type_kernel;
         bp.resv = NULL;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 29cac5525767..f06f5ef0ca4b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -263,7 +263,7 @@ static int psp_tmr_init(struct psp_context *psp)
 
         ret = amdgpu_bo_create_kernel(psp->adev, tmr_size, PSP_TMR_SIZE,
                                       AMDGPU_GEM_DOMAIN_VRAM,
-                                      &psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf);
+                                      &psp->tmr_bo, &psp->tmr_mc_addr, NULL);
 
         return ret;
 }
@@ -1216,7 +1216,7 @@ static int psp_hw_fini(void *handle)
 
         psp_ring_destroy(psp, PSP_RING_TYPE__KM);
 
-        amdgpu_bo_free_kernel(&psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf);
+        amdgpu_bo_free_kernel(&psp->tmr_bo, &psp->tmr_mc_addr, NULL);
         amdgpu_bo_free_kernel(&psp->fw_pri_bo,
                               &psp->fw_pri_mc_addr, &psp->fw_pri_buf);
         amdgpu_bo_free_kernel(&psp->fence_buf_bo,
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
index b73d4aa28fba..bc0947f6bc8a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
@@ -171,7 +171,6 @@ struct psp_context
         /* tmr buffer */
         struct amdgpu_bo                *tmr_bo;
         uint64_t                        tmr_mc_addr;
-        void                            *tmr_buf;
 
         /* asd firmware and buffer */
         const struct firmware           *asd_fw;