瀏覽代碼

drm/amdgpu/psp: Enlarge PSP TMR SIZE from 3M to 4M.

Enlarge the PSP TMR SIZE to 4M for dual UVD fw front-door loading.

Signed-off-by: Feifei Xu <Feifei.Xu@amd.com>
Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Feifei Xu 7 年之前
父節點
當前提交
3082be1aea
共有 2 個文件被更改,包括 5 次插入2 次删除
  1. 4 2
      drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
  2. 1 0
      drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h

+ 4 - 2
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

@@ -163,7 +163,7 @@ static int psp_tmr_init(struct psp_context *psp)
 	 * Note: this memory need be reserved till the driver
 	 * Note: this memory need be reserved till the driver
 	 * uninitializes.
 	 * uninitializes.
 	 */
 	 */
-	ret = amdgpu_bo_create_kernel(psp->adev, 0x300000, 0x100000,
+	ret = amdgpu_bo_create_kernel(psp->adev, PSP_TMR_SIZE, 0x100000,
 				      AMDGPU_GEM_DOMAIN_VRAM,
 				      AMDGPU_GEM_DOMAIN_VRAM,
 				      &psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf);
 				      &psp->tmr_bo, &psp->tmr_mc_addr, &psp->tmr_buf);
 
 
@@ -179,7 +179,9 @@ static int psp_tmr_load(struct psp_context *psp)
 	if (!cmd)
 	if (!cmd)
 		return -ENOMEM;
 		return -ENOMEM;
 
 
-	psp_prep_tmr_cmd_buf(cmd, psp->tmr_mc_addr, 0x300000);
+	psp_prep_tmr_cmd_buf(cmd, psp->tmr_mc_addr, PSP_TMR_SIZE);
+	DRM_INFO("reserve 0x%x from 0x%llx for PSP TMR SIZE\n",
+			PSP_TMR_SIZE, psp->tmr_mc_addr);
 
 
 	ret = psp_cmd_submit_buf(psp, NULL, cmd,
 	ret = psp_cmd_submit_buf(psp, NULL, cmd,
 				 psp->fence_buf_mc_addr, 1);
 				 psp->fence_buf_mc_addr, 1);

+ 1 - 0
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h

@@ -32,6 +32,7 @@
 #define PSP_CMD_BUFFER_SIZE	0x1000
 #define PSP_CMD_BUFFER_SIZE	0x1000
 #define PSP_ASD_SHARED_MEM_SIZE	0x4000
 #define PSP_ASD_SHARED_MEM_SIZE	0x4000
 #define PSP_1_MEG		0x100000
 #define PSP_1_MEG		0x100000
+#define PSP_TMR_SIZE	0x400000
 
 
 struct psp_context;
 struct psp_context;