[PATCH v2 1/1] drm/amd: Don't init MEC2 firmware when it fails to load

[Mario Limonciello]

On 1/29/2024 16:18, David McFarland wrote:
> The same calls are made directly above, but conditional on the firmware
> loading and validating successfully.
> 
> Fixes: 9931b67690cf ("drm/amd: Load GFX10 microcode during early_init")
> Signed-off-by: David McFarland <corngood at gmail.com>
> ---
> v2: signed off
Thanks.

Reviewed-by: Mario Limonciello <mario.limonciello at amd.com>

And I'll apply this now.

> 
>   drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 2 --
>   1 file changed, 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 d63cab294883..b0ba68016a02 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
> @@ -4027,8 +4027,6 @@ static int gfx_v10_0_init_microcode(struct amdgpu_device *adev)
>   		err = 0;
>   		adev->gfx.mec2_fw = NULL;
>   	}
> -	amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_MEC2);
> -	amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_MEC2_JT);
>   
>   	gfx_v10_0_check_fw_write_wait(adev);
>   out: