drm/amd/powerplay: Fix CZ SMU firmware load check
Subsystems (2)
PATCH 1/1 drm/amd/powerplay: Fix CZ SMU firmware load check
Remove an errant return in the middle of the check function as well as check for success in the start function.
--- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +3 -4
@@ -195,9 +195,6 @@ static int cz_check_fw_load_finish(struct pp_smumgr *smumgr,if (smumgr ==NULL || smumgr->device ==NULL )return -EINVAL ; -return cgs_read_register (smumgr->device, - mmSMU_MP1_SRBM2P_ARG_0); -cgs_write_register (smumgr->device, mmMP0PUB_IND_INDEX, index);for (i =0 ; i < smumgr->usec_timeout; i++) {
@@ -276,7 +273,9 @@ static int cz_start_smu(struct pp_smumgr *smumgr) fw_to_check &= ~(UCODE_ID_SDMA1_MASK |UCODE_ID_CP_MEC_JT2_MASK );cz_request_smu_load_fw (smumgr); -cz_check_fw_load_finish (smumgr, fw_to_check); + ret =cz_check_fw_load_finish (smumgr, fw_to_check); +if (ret) +printk (KERN_ERR "[ powerplay] SMU firmware load failed\n" ); ret =cz_load_mec_firmware (smumgr);if (ret)
Signature · 6 lines
2.9.2 _______________________________________________ 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]
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 10 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Friday, August 26, 2016 10:35 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH] drm/amd/powerplay: Fix CZ SMU firmware load check
Quoted 5 lines
Remove an errant return in the middle of the check function as well as check for success in the start function.
Signed-off-by Tom St Denis <[email protected]>
Quoted 37 lines
--- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +0
-3@@ -195,9 +195,6 @@ static int cz_check_fw_load_finish(struct pp_smumgr *smumgr, if (smumgr == NULL || smumgr->device == NULL) return -EINVAL; -return cgs_read_register (smumgr->device, - mmSMU_MP1_SRBM2P_ARG_0); -cgs_write_register (smumgr->device, mmMP0PUB_IND_INDEX, index);drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +3
-1for (i =0 ; i < smumgr->usec_timeout; i++) {@@ -276,7 +273,9 @@ static int cz_start_smu(struct pp_smumgr *smumgr) fw_to_check &= ~(UCODE_ID_SDMA1_MASK |UCODE_ID_CP_MEC_JT2_MASK );cz_request_smu_load_fw (smumgr); -cz_check_fw_load_finish (smumgr, fw_to_check); + ret =cz_check_fw_load_finish (smumgr, fw_to_check); +if (ret) +printk (KERN_ERR "[ powerplay] SMU firmware load failed\n");drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +0
-1ret =cz_load_mec_firmware (smumgr);if (ret) --2.9.2
Quoted 4 lines
_______________________________________________
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
A message that is not in the archive (sent off-list or not yet received): MWHPR12MB1694DD544FAF6B5246CC3717F7EC0-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
StDenis, Tom
Reviewed-by Alex DeucherThanks. I sent out a v2 where it adds a check to the load call as well.
Tom
________________________________
From: Deucher, Alexander
Sent: Friday, August 26, 2016 10:42
To: 'Tom St Denis'; [email protected]
Cc: StDenis, Tom
Subject: RE: [PATCH] drm/amd/powerplay: Fix CZ SMU firmware load check
Quoted 8 lines
-----Original Message-----
From: amd-gfx [mailto:amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org] On Behalf Of Tom St Denis
Sent: Friday, August 26, 2016 10:35 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH] drm/amd/powerplay: Fix CZ SMU firmware load check
Quoted 5 lines
Remove an errant return in the middle of the check function as well as check for success in the start function.
Signed-off-by Tom St Denis <[email protected]>
Quoted 34 lines
--- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +0
-3@@ -195,9 +195,6 @@ static int cz_check_fw_load_finish(struct pp_smumgr *smumgr, if (smumgr == NULL || smumgr->device == NULL) return -EINVAL; -return cgs_read_register (smumgr->device, - mmSMU_MP1_SRBM2P_ARG_0); -cgs_write_register (smumgr->device, mmMP0PUB_IND_INDEX, index);for (i = 0; i < smumgr->usec_timeout; i++) {drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +3
-1@@ -276,7 +273,9 @@ static int cz_start_smu(struct pp_smumgr *smumgr) fw_to_check &= ~(UCODE_ID_SDMA1_MASK |UCODE_ID_CP_MEC_JT2_MASK );cz_request_smu_load_fw (smumgr); -cz_check_fw_load_finish (smumgr, fw_to_check); + ret =cz_check_fw_load_finish (smumgr, fw_to_check); +if (ret) +printk (KERN_ERR "[ powerplay] SMU firmware load failed\n");ret = cz_load_mec_firmware(smumgr); if (ret)
Quoted 7 lines
--
2.9.2_______________________________________________
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