On Tue, Aug 13, 2024 at 2:04 AM Yang Wang <kevinyang.wang@xxxxxxx> wrote:
>
> Skip rlc firmware validation to ignore firmware header size mismatch issues.
> Refs: 49e133c973ce ("drm/amdgpu: Fix the null pointer when load rlc firmware")
>
> Fixes: e1c6c2c1099f ("drm/amdgpu: refine gfx10 firmware loading")
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3551
Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
>
> Signed-off-by: Yang Wang <kevinyang.wang@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> index 75a6ca645964..ca983a014ba0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> @@ -4116,6 +4116,7 @@ static void gfx_v10_0_check_gfxoff_flag(struct amdgpu_device *adev)
>
> static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
> {
> + char fw_name[53];
> char ucode_prefix[30];
> const char *wks = "";
> int err;
> @@ -4149,8 +4150,8 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
> amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_CE);
>
> if (!amdgpu_sriov_vf(adev)) {
> - err = amdgpu_ucode_request(adev, &adev->gfx.rlc_fw,
> - "amdgpu/%s_rlc.bin", ucode_prefix);
> + snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_rlc.bin", ucode_prefix);
> + err = request_firmware(&adev->gfx.rlc_fw, fw_name, adev->dev);
> if (err)
> goto out;
>
> --
> 2.34.1
>
