Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83667ed6 authored by Tom St Denis's avatar Tom St Denis Committed by Alex Deucher
Browse files

drm/amd/powerplay: Only load SDMA0/MEC firmware once on Stoney (v2) 



Only load the SDMA0/MEC1 firmware once in the Carrizo SMU manager
driver.

(v2) Avoid loading SDMA0 twice too.

Signed-off-by: default avatarTom St Denis <tom.stdenis@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 610ecfd6

drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c

+2 −8
Original line number Diff line number Diff line
@@ -560,10 +560,7 @@ static int cz_smu_construct_toc_for_bootup(struct pp_smumgr *smumgr) 


	cz_smu_populate_single_ucode_load_task(smumgr,

				CZ_SCRATCH_ENTRY_UCODE_ID_SDMA0, false);

	if (smumgr->chip_id == CHIP_STONEY)

		cz_smu_populate_single_ucode_load_task(smumgr,

				CZ_SCRATCH_ENTRY_UCODE_ID_SDMA0, false);

	else

	if (smumgr->chip_id != CHIP_STONEY)

		cz_smu_populate_single_ucode_load_task(smumgr,

				CZ_SCRATCH_ENTRY_UCODE_ID_SDMA1, false);

	cz_smu_populate_single_ucode_load_task(smumgr,
@@ -574,10 +571,7 @@ static int cz_smu_construct_toc_for_bootup(struct pp_smumgr *smumgr) 
				CZ_SCRATCH_ENTRY_UCODE_ID_CP_ME, false);

	cz_smu_populate_single_ucode_load_task(smumgr,

				CZ_SCRATCH_ENTRY_UCODE_ID_CP_MEC_JT1, false);

	if (smumgr->chip_id == CHIP_STONEY)

		cz_smu_populate_single_ucode_load_task(smumgr,

				CZ_SCRATCH_ENTRY_UCODE_ID_CP_MEC_JT1, false);

	else

	if (smumgr->chip_id != CHIP_STONEY)

		cz_smu_populate_single_ucode_load_task(smumgr,

				CZ_SCRATCH_ENTRY_UCODE_ID_CP_MEC_JT2, false);

	cz_smu_populate_single_ucode_load_task(smumgr,