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

[Mario Limonciello]

On 1/29/2024 14:46, Mario Limonciello wrote:
> On 1/28/2024 10: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")
> 
> This is a great find, thank you for the fix.  I'll apply it to our tree 
> and Alex should send it in a future fixes PR.
> 
> Reviewed-by: Mario Limonciello <mario.limonciello at amd.com>

Sorry to be pedantic; but I realized after I tried to apply this is 
missing a S-o-b.  Can you please add one?

> 
>> ---
>>   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
>> @@ -4022,18 +4022,16 @@ static int gfx_v10_0_init_microcode(struct 
>> amdgpu_device *adev)
>>       err = amdgpu_ucode_request(adev, &adev->gfx.mec2_fw, fw_name);
>>       if (!err) {
>>           amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_MEC2);
>>           amdgpu_gfx_cp_init_microcode(adev, AMDGPU_UCODE_ID_CP_MEC2_JT);
>>       } else {
>>           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:
>>       if (err) {
>>           amdgpu_ucode_release(&adev->gfx.pfp_fw);
>>           amdgpu_ucode_release(&adev->gfx.me_fw);
>>           amdgpu_ucode_release(&adev->gfx.ce_fw);
>>           amdgpu_ucode_release(&adev->gfx.rlc_fw);
>