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

Submitted by Tom St Denis on Aug. 26, 2016, 4:46 p.m.

Details

Message ID 20160826164627.6734-4-tom.stdenis@amd.com
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Tom St Denis Aug. 26, 2016, 4:46 p.m.
Only load the MEC1 firmware once in the Carrizo SMU manager
driver.

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

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,

Comments

> -----Original Message-----

> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf

> Of Tom St Denis

> Sent: Friday, August 26, 2016 12:46 PM

> To: amd-gfx@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@amd.com>


For the series:
Reviewed-by: Alex Deucher <alexander.deucher@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

> 

> _______________________________________________

> amd-gfx mailing list

> amd-gfx@lists.freedesktop.org

> https://lists.freedesktop.org/mailman/listinfo/amd-gfx