回复: [PATCH] drm/amdgpu: fix sdma firmware version error in sriov

[Yang, Stanley]

[AMD Official Use Only]

Reviewed-by: Stanley.Yang <Stanley.Yang at amd.com>

Regards,
Stanley
> -----邮件原件-----
> 发件人: Wang, Kevin(Yang) <Kevin1.Wang at amd.com>
> 发送时间: Monday, May 31, 2021 5:33 PM
> 收件人: amd-gfx at lists.freedesktop.org
> 抄送: frank.min at amd.ccom; Yang, Stanley <Stanley.Yang at amd.com>; Wang,
> Kevin(Yang) <Kevin1.Wang at amd.com>
> 主题: [PATCH] drm/amdgpu: fix sdma firmware version error in sriov
> 
> Re-adjust the function return order to avoid empty sdma version in the sriov
> environment. (read amdgpu_firmware_info)
> 
> Signed-off-by: Kevin Wang <kevin1.wang at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
> b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
> index deb907f96090..98059bce692f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
> @@ -147,9 +147,6 @@ static int sdma_v5_2_init_microcode(struct
> amdgpu_device *adev)
>  	struct amdgpu_firmware_info *info = NULL;
>  	const struct common_firmware_header *header = NULL;
> 
> -	if (amdgpu_sriov_vf(adev) && (adev->asic_type ==
> CHIP_SIENNA_CICHLID))
> -		return 0;
> -
>  	DRM_DEBUG("\n");
> 
>  	switch (adev->asic_type) {
> @@ -187,6 +184,9 @@ static int sdma_v5_2_init_microcode(struct
> amdgpu_device *adev)
>  		       (void *)&adev->sdma.instance[0],
>  		       sizeof(struct amdgpu_sdma_instance));
> 
> +	if (amdgpu_sriov_vf(adev) && (adev->asic_type ==
> CHIP_SIENNA_CICHLID))
> +		return 0;
> +
>  	DRM_DEBUG("psp_load == '%s'\n",
>  		  adev->firmware.load_type == AMDGPU_FW_LOAD_PSP ?
> "true" : "false");
> 
> --
> 2.17.1