Commit 8ef85a0c authored by David McFarland's avatar David McFarland Committed by Alex Deucher
Browse files

drm/amd: Don't init MEC2 firmware when it fails to load 



The same calls are made directly above, but conditional on the firmware
loading and validating successfully.

Cc: stable@vger.kernel.org
Fixes: 9931b676 ("drm/amd: Load GFX10 microcode during early_init")
Signed-off-by: default avatarDavid McFarland <corngood@gmail.com>
Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bb34bc2c

drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c

+0 −2
Original line number Diff line number Diff line
@@ -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: