drm/amdgpu: skip fw pri bo alloc for SRIOV
Subsystems (2)
PATCH 1/1 drm/amdgpu: skip fw pri bo alloc for SRIOV
PSP fw primary buffer is not used under SRIOV Therefore, we don't need to allocate memory for it.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +13 -9
@@ -905,13 +905,16 @@ static int psp_load_fw(struct amdgpu_device *adev)if (!psp->cmd)return -ENOMEM ; - ret =amdgpu_bo_create_kernel (adev,PSP_1_MEG ,PSP_1_MEG , -AMDGPU_GEM_DOMAIN_GTT , - &psp->fw_pri_bo, - &psp->fw_pri_mc_addr, - &psp->fw_pri_buf); -if (ret) - goto failed; +/* 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, + &psp->fw_pri_mc_addr, + &psp->fw_pri_buf); +if (ret) + goto failed; + } ret = amdgpu_bo_create_kernel(adev, PSP_FENCE_BUFFER_SIZE, PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM,
@@ -1012,8 +1015,9 @@ 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->fw_pri_bo, - &psp->fw_pri_mc_addr, &psp->fw_pri_buf); +if (!amdgpu_sriov_vf (psp->adev)) +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, &psp->fence_buf_mc_addr, &psp->fence_buf); amdgpu_bo_free_kernel(&psp->asd_shared_bo, &psp->asd_shared_mc_addr,
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1557983492-25237-1-git-send-email-yttao-5C7GfCeVMHo@public.gmane.org
Am 16.05.19 um 07:11 schrieb Yintian Tao:
Quoted 38 lines
PSP fw primary buffer is not used under SRIOV Therefore, we don't need to allocate memory for it.
Signed-off-by Yintian Tao <[email protected]>Signed-off-by Monk Liu <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +10
-7@@ -905,13 +905,16 @@ static int psp_load_fw(struct amdgpu_device *adev)if (!psp->cmd)return -ENOMEM ; - ret =amdgpu_bo_create_kernel (adev,PSP_1_MEG ,PSP_1_MEG , -AMDGPU_GEM_DOMAIN_GTT , - &psp->fw_pri_bo, - &psp->fw_pri_mc_addr, - &psp->fw_pri_buf); -if (ret) - goto failed; +/* 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, + &psp->fw_pri_mc_addr, + &psp->fw_pri_buf); +if (ret) + goto failed; + } ret = amdgpu_bo_create_kernel(adev, PSP_FENCE_BUFFER_SIZE, PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM,
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c static int psp_hw_fini(void *handle) · line 1020
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +3
-2@@ -1012,8 +1015,9 @@ 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->fw_pri_bo, - &psp->fw_pri_mc_addr, &psp->fw_pri_buf); +if (!amdgpu_sriov_vf (psp->adev)) +amdgpu_bo_free_kernel (&psp->fw_pri_bo, + &psp->fw_pri_mc_addr, &psp->fw_pri_buf);
This is superfluous, amdgpu_bo_free_kernel() does a NULL check anyway.
Apart from that looks good to me,
Christian.
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c static int psp_hw_fini(void *handle) · line 1023
Quoted 3 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +0
-0amdgpu_bo_free_kernel (&psp->fence_buf_bo, &psp->fence_buf_mc_addr, &psp->fence_buf); amdgpu_bo_free_kernel(&psp->asd_shared_bo, &psp->asd_shared_mc_addr,
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx