[PATCH 04/18] drm/amdgpu: refine mes firmware loading

[Deucher, Alexander]

[AMD Official Use Only - AMD Internal Distribution Only]

> -----Original Message-----
> From: Wang, Yang(Kevin) <KevinYang.Wang at amd.com>
> Sent: Friday, May 31, 2024 2:53 AM
> To: amd-gfx at lists.freedesktop.org
> Cc: Zhang, Hawking <Hawking.Zhang at amd.com>; Deucher, Alexander
> <Alexander.Deucher at amd.com>
> Subject: [PATCH 04/18] drm/amdgpu: refine mes firmware loading
>
> refine mes firmware loading
>
> Signed-off-by: Yang Wang <kevinyang.wang at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
> index 62edf6328566..9194a53b7c14 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
> @@ -1528,11 +1528,9 @@ int amdgpu_mes_init_microcode(struct
> amdgpu_device *adev, int pipe)
>
>       r = amdgpu_ucode_request(adev, &adev->mes.fw[pipe], fw_name);
>       if (r && need_retry && pipe == AMDGPU_MES_SCHED_PIPE) {
> -             snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mes.bin",
> -                      ucode_prefix);
> -             DRM_INFO("try to fall back to %s\n", fw_name);
> +             DRM_INFO("try to fall back to %s_mes.bin\n", ucode_prefix);

While you are here, can you convert the DRM_INFO() macros to dev_info() instead so we can get better output on multi-GPU systems?

Alex

>               r = amdgpu_ucode_request(adev, &adev->mes.fw[pipe],
> -                                      fw_name);
> +                                      "amdgpu/%s_mes.bin",
> ucode_prefix);
>       }
>
>       if (r)
> --
> 2.34.1