Tidy up the CZ SMU Mananger
Subsystems (2)
The first two patches fix up code style and error return codes.
The third patch avoids loading the MEC1 firmware twice on Stoney parts.
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/3 drm/amd/powerplay: Tidy up cz SMU manager
--- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +2 -16
@@ -89,13 +89,8 @@ static int cz_send_msg_to_smc(struct pp_smumgr *smumgr, uint16_t msg)if (result !=0 )return result; - result =SMUM_WAIT_FIELD_UNEQUAL (smumgr, +return SMUM_WAIT_FIELD_UNEQUAL (smumgr,SMU_MP1_SRBM2P_RESP_0 ,CONTENT ,0 ); - -if (result !=0 ) -return result; - -return 0 ; } static int cz_set_smc_sram_address(struct pp_smumgr *smumgr,
@@ -177,11 +172,9 @@ static int cz_request_smu_load_fw(struct pp_smumgr *smumgr)cz_send_msg_to_smc_with_parameter (smumgr, PPSMC_MSG_ExecuteJob, cz_smu->toc_entry_power_profiling_index); - result =cz_send_msg_to_smc_with_parameter (smumgr, +return cz_send_msg_to_smc_with_parameter (smumgr, PPSMC_MSG_ExecuteJob, cz_smu->toc_entry_initialize_index); - -return result; } static int cz_check_fw_load_finish(struct pp_smumgr *smumgr,
@@ -610,19 +603,12 @@ static int cz_smu_construct_toc(struct pp_smumgr *smumgr)struct cz_smumgr *cz_smu = (struct cz_smumgr *)smumgr->backend; cz_smu->toc_entry_used_count =0 ; -cz_smu_initialize_toc_empty_job_list (smumgr); -cz_smu_construct_toc_for_rlc_aram_save (smumgr); -cz_smu_construct_toc_for_vddgfx_enter (smumgr); -cz_smu_construct_toc_for_vddgfx_exit (smumgr); -cz_smu_construct_toc_for_power_profiling (smumgr); -cz_smu_construct_toc_for_bootup (smumgr); -cz_smu_construct_toc_for_clock_table (smumgr);return 0 ;
Signature · 6 lines
2.9.3 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/3 drm/amd/powerplay: Fix up return codes in cz SMU manager
In reply to a message not in the archive--- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +5 -4
@@ -101,12 +101,12 @@ static int cz_set_smc_sram_address(struct pp_smumgr *smumgr,if (0 != (3 & smc_address)) {printk (KERN_ERR "[ powerplay ] SMC address must be 4 byte aligned\n" ); -return -1 ; +return -EINVAL ; }if (limit <= (smc_address +3 )) {printk (KERN_ERR "[ powerplay ] SMC address beyond the SMC RAM area\n" ); -return -1 ; +return -EINVAL ; } cgs_write_register(smumgr->device, mmMP0PUB_IND_INDEX_0,
@@ -124,9 +124,10 @@ static int cz_write_smc_sram_dword(struct pp_smumgr *smumgr,return -EINVAL ; result =cz_set_smc_sram_address (smumgr, smc_address, limit); -cgs_write_register (smumgr->device, mmMP0PUB_IND_DATA_0, value); +if (!result) +cgs_write_register (smumgr->device, mmMP0PUB_IND_DATA_0, value); -return 0 ; +return result; } static int cz_send_msg_to_smc_with_parameter(struct pp_smumgr *smumgr,
Signature · 6 lines
2.9.3 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amd/powerplay: Only load MEC firmware once on Stoney
In reply to a message not in the archiveOnly load the MEC1 firmware once in the Carrizo SMU manager driver.
--- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +1 -4
@@ -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,
Signature · 6 lines
2.9.3 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 3/3] drm/amd/powerplay: Only load MEC firmware once on Stoney
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 <[email protected]>
Sent: Friday, August 26, 2016 12:46
To: [email protected]
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.
--- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +1 -4
@@ -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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): DM5PR12MB1132C685592A9CB895B951A5F7EC0-2J9CzHegvk+UzrhdoDeimQdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
RE: [PATCH 3/3] drm/amd/powerplay: Only load MEC firmware once on Stoney
Wrong patch? ;)
From: amd-gfx [mailto:amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org] On Behalf Of StDenis, Tom
Sent: Friday, August 26, 2016 12:48 PM
To: [email protected]
Subject: Re: [PATCH 3/3] drm/amd/powerplay: Only load MEC firmware once on Stoney
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 <[email protected]<mailto:[email protected]>>
Sent: Friday, August 26, 2016 12:46
To: [email protected]<mailto:[email protected]>
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.
--- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +1 -4
@@ -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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): MWHPR12MB16943D4174366F50B3FF6E8BF7EC0-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Re: [PATCH 3/3] drm/amd/powerplay: Only load MEC firmware once on Stoney
Patch #3 is correct but missing the SDMA0 duplicate which I amended locally. I only noticed it after I hit send.
________________________________
From: Deucher, Alexander
Sent: Friday, August 26, 2016 12:49
To: StDenis, Tom; [email protected]
Subject: RE: [PATCH 3/3] drm/amd/powerplay: Only load MEC firmware once on Stoney
Wrong patch? ;)
From: amd-gfx [mailto:amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org] On Behalf Of StDenis, Tom
Sent: Friday, August 26, 2016 12:48 PM
To: [email protected]
Subject: Re: [PATCH 3/3] drm/amd/powerplay: Only load MEC firmware once on Stoney
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 <[email protected]<mailto:[email protected]>>
Sent: Friday, August 26, 2016 12:46
To: [email protected]<mailto:[email protected]>
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.
--- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +1 -4
@@ -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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): DM5PR12MB1132D8264821843420BD7640F7EC0-2J9CzHegvk+UzrhdoDeimQdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
RE: [PATCH 3/3] drm/amd/powerplay: Only load MEC firmware once on Stoney
Sorry mi-read your email.
From: StDenis, Tom
Sent: Friday, August 26, 2016 12:50 PM
To: Deucher, Alexander; [email protected]
Subject: Re: [PATCH 3/3] drm/amd/powerplay: Only load MEC firmware once on Stoney
Patch #3 is correct but missing the SDMA0 duplicate which I amended locally. I only noticed it after I hit send.
________________________________
From: Deucher, Alexander
Sent: Friday, August 26, 2016 12:49
To: StDenis, Tom; [email protected]<mailto:[email protected]>
Subject: RE: [PATCH 3/3] drm/amd/powerplay: Only load MEC firmware once on Stoney
Wrong patch? ;)
From: amd-gfx [mailto:amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org] On Behalf Of StDenis, Tom
Sent: Friday, August 26, 2016 12:48 PM
To: [email protected]<mailto:[email protected]>
Subject: Re: [PATCH 3/3] drm/amd/powerplay: Only load MEC firmware once on Stoney
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 <[email protected]<mailto:[email protected]>>
Sent: Friday, August 26, 2016 12:46
To: [email protected]<mailto:[email protected]>
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.
--- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +1 -4
@@ -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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Reviewed-by Alex DeucherRE: [PATCH 3/3] drm/amd/powerplay: Only load MEC firmware once on Stoney
In reply to a message not in the archiveQuoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Friday, August 26, 2016 12:46 PM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH 3/3] drm/amd/powerplay: Only load MEC firmware once on Stoney
Quoted 4 lines
Only load the MEC1 firmware once in the Carrizo SMU manager driver.
Signed-off-by Tom St Denis <[email protected]>
For the series:
Quoted 25 lines
--- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +1
-4@@ -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);
Quoted 8 lines
cz_smu_populate_single_ucode_load_task(smumgr,
--
2.9.3_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Edward O'Callaghan
Reviewed-byWith the SDMA0 duplicate fixup, this series is:
Quoted 10 lines · Tom St Denis
The first two patches fix up code style and error return codes.
The third patch avoids loading the MEC1 firmware twice on Stoney parts.
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx