Looks good to me now, but I don't
know the technical background why this
BO is not needed under SRIOV.
So this patch is Acked-by: Christian König
<christian.koenig@xxxxxxx>.
Regards,
Christian.
Am 17.05.19 um 04:41 schrieb Tao, Yintian:
> Hi Christian
>
>
> I have modified it according to your suggestion. Can
you help review this again? Thanks in advance.
>
>
> Best Regards
> Yintian Tao
>
> -----Original Message-----
> From: Yintian Tao
<yttao@xxxxxxx>
> Sent: Thursday, May 16, 2019 7:54 PM
> To:
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> Cc: Tao, Yintian
<Yintian.Tao@xxxxxxx>; Liu,
Monk
<Monk.Liu@xxxxxxx>
> Subject: [PATCH] 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.
>
> v2: remove superfluous check for
amdgpu_bo_free_kernel().
>
> Signed-off-by: Yintian Tao
<yttao@xxxxxxx>
> Signed-off-by: Monk Liu
<Monk.Liu@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 17
++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index c567a55..af9835c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -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,