[3/3] drm/amd/powerplay: Only load MEC firmware once on Stoney

Submitted by StDenis, Tom on Aug. 26, 2016, 4:48 p.m.

Details

Message ID DM5PR12MB1132C685592A9CB895B951A5F7EC0@DM5PR12MB1132.namprd12.prod.outlook.com
State New
Headers show
Series "Series without cover letter" ( rev: 4 3 2 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

StDenis, Tom Aug. 26, 2016, 4:48 p.m.
I swear this isn't intentional but I just realized that SDMA0 was loaded twice too only after hitting send-email.  I've amended my patch locally to avoid loading SDMA0 twice too..


Tom

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c
index f51bd8de2f69..1529516089bc 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c
@@ -574,10 +574,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,