Revert "drm/amdgpu: Allocate psp fw private buffer in vram"

Hawking Zhang · alexdeucher · commit 46fbe1e349b8 · 2025-09-15T16:56:15.000-04:00
This reverts commit 22dcb28. Need to certain APU platforms and will proceed to rework the patch accordingly Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com> Reviewed-by: Le Ma <Le.Ma@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -506,7 +506,8 @@ static int psp_sw_init(struct amdgpu_ip_block *ip_block)
 	}
 
 	ret = amdgpu_bo_create_kernel(adev, PSP_1_MEG, PSP_1_MEG,
-				      AMDGPU_GEM_DOMAIN_VRAM,
+				      (amdgpu_sriov_vf(adev) || adev->debug_use_vram_fw_buf) ?
+				      AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT,
 				      &psp->fw_pri_bo,
 				      &psp->fw_pri_mc_addr,
 				      &psp->fw_pri_buf);

Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,8 @@ static int psp_sw_init(struct amdgpu_ip_block *ip_block)`
`506`	`506`	`}`
`507`	`507`
`508`	`508`	`ret = amdgpu_bo_create_kernel(adev, PSP_1_MEG, PSP_1_MEG,`
`509`		`- AMDGPU_GEM_DOMAIN_VRAM,`
	`509`	`+ (amdgpu_sriov_vf(adev) \|\| adev->debug_use_vram_fw_buf) ?`
	`510`	`+ AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT,`
`510`	`511`	`&psp->fw_pri_bo,`
`511`	`512`	`&psp->fw_pri_mc_addr,`
`512`	`513`	`&psp->fw_pri_buf);`