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

[StDenis, Tom]

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


________________________________
From: Tom St Denis <tstdenis82 at gmail.com>
Sent: Friday, August 26, 2016 12:46
To: amd-gfx at lists.freedesktop.org
Cc: StDenis, Tom
Subject: [PATCH 3/3] drm/amd/powerplay: Only load MEC firmware once on Stoney

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

Signed-off-by: Tom St Denis <tom.stdenis at amd.com>
---
 drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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,
--
2.9.3

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20160826/db30c2a9/attachment-0001.html>