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

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
...@@ -466,8 +466,6 @@ static int psp_xgmi_load(struct psp_context *psp) ...@@ -466,8 +466,6 @@ static int psp_xgmi_load(struct psp_context *psp)
/* /*
* TODO: bypass the loading in sriov for now * 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); cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);
if (!cmd) if (!cmd)
...@@ -508,8 +506,6 @@ static int psp_xgmi_unload(struct psp_context *psp) ...@@ -508,8 +506,6 @@ static int psp_xgmi_unload(struct psp_context *psp)
/* /*
* TODO: bypass the unloading in sriov for now * 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); cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);
if (!cmd) if (!cmd)
...@@ -540,11 +536,6 @@ int psp_xgmi_invoke(struct psp_context *psp, uint32_t ta_cmd_id) ...@@ -540,11 +536,6 @@ int psp_xgmi_invoke(struct psp_context *psp, uint32_t ta_cmd_id)
int ret; int ret;
struct psp_gfx_cmd_resp *cmd; 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); cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);
if (!cmd) if (!cmd)
...@@ -1506,16 +1497,13 @@ static int psp_load_fw(struct amdgpu_device *adev) ...@@ -1506,16 +1497,13 @@ static int psp_load_fw(struct amdgpu_device *adev)
if (!psp->cmd) if (!psp->cmd)
return -ENOMEM; return -ENOMEM;
/* this fw pri bo is not used under SRIOV */ ret = amdgpu_bo_create_kernel(adev, PSP_1_MEG, PSP_1_MEG,
if (!amdgpu_sriov_vf(psp->adev)) { AMDGPU_GEM_DOMAIN_GTT,
ret = amdgpu_bo_create_kernel(adev, PSP_1_MEG, PSP_1_MEG, &psp->fw_pri_bo,
AMDGPU_GEM_DOMAIN_GTT, &psp->fw_pri_mc_addr,
&psp->fw_pri_bo, &psp->fw_pri_buf);
&psp->fw_pri_mc_addr, if (ret)
&psp->fw_pri_buf); goto failed;
if (ret)
goto failed;
}
ret = amdgpu_bo_create_kernel(adev, PSP_FENCE_BUFFER_SIZE, PAGE_SIZE, ret = amdgpu_bo_create_kernel(adev, PSP_FENCE_BUFFER_SIZE, PAGE_SIZE,
AMDGPU_GEM_DOMAIN_VRAM, AMDGPU_GEM_DOMAIN_VRAM,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment