Commit fdf57ba6 authored by Frank.Min's avatar Frank.Min Committed by Alex Deucher
Browse files

drm/amdgpu: enable xgmi init for sriov use case 



1. enable xgmi ta initialization for sriov
2. enable xgmi initialization for sriov

Signed-off-by: default avatarFrank.Min <Frank.Min@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 33a9a5ab

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

+7 −19
Original line number Diff line number Diff line
@@ -466,8 +466,6 @@ static int psp_xgmi_load(struct psp_context *psp) 
	/*

	 * TODO: bypass the loading in sriov for now

	 */

	if (amdgpu_sriov_vf(psp->adev))

		return 0;



	cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);

	if (!cmd)
@@ -508,8 +506,6 @@ static int psp_xgmi_unload(struct psp_context *psp) 
	/*

	 * TODO: bypass the unloading in sriov for now

	 */

	if (amdgpu_sriov_vf(psp->adev))

		return 0;



	cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);

	if (!cmd)
@@ -540,11 +536,6 @@ int psp_xgmi_invoke(struct psp_context *psp, uint32_t ta_cmd_id) 
	int ret;

	struct psp_gfx_cmd_resp *cmd;



	/*

	 * TODO: bypass the loading in sriov for now

	*/

	if (amdgpu_sriov_vf(psp->adev))

		return 0;



	cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);

	if (!cmd)
@@ -1506,8 +1497,6 @@ static int psp_load_fw(struct amdgpu_device *adev) 
	if (!psp->cmd)

		return -ENOMEM;



	/* this fw pri bo is not used under SRIOV */

	if (!amdgpu_sriov_vf(psp->adev)) {

	ret = amdgpu_bo_create_kernel(adev, PSP_1_MEG, PSP_1_MEG,

					AMDGPU_GEM_DOMAIN_GTT,

					&psp->fw_pri_bo,
@@ -1515,7 +1504,6 @@ static int psp_load_fw(struct amdgpu_device *adev) 
					&psp->fw_pri_buf);

	if (ret)

		goto failed;

	}



	ret = amdgpu_bo_create_kernel(adev, PSP_FENCE_BUFFER_SIZE, PAGE_SIZE,

					AMDGPU_GEM_DOMAIN_VRAM,

CRA Git | Maintained and supported by SUSTech CRA and CCSE