drm/amd/powerplay: Fix CZ SMU firmware load check (v2)
Subsystems (2)
PATCH 1/1 drm/amd/powerplay: Fix CZ SMU firmware load check (v2)
Remove an errant return in the middle of the check function as well as check for success in the start function.
(v2) Add return check to smu_load_fw()
--- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +9 -5
@@ -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++) {
@@ -275,8 +272,15 @@ static int cz_start_smu(struct pp_smumgr *smumgr)if (smumgr->chip_id ==CHIP_STONEY ) 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_request_smu_load_fw (smumgr); +if (ret) { +printk (KERN_ERR "[ powerplay] SMU firmware load failed\n" ); +return ret; + } + + ret =cz_check_fw_load_finish (smumgr, fw_to_check); +if (ret) +return ret; ret =cz_load_mec_firmware (smumgr);if (ret)
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]
Quoted 44 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Friday, August 26, 2016 10:55 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH] drm/amd/powerplay: Fix CZ SMU firmware load check (v2)Remove an errant return in the middle of the check function as well as check for success in the start function.
(v2) Add return check to
smu_load_fw()Signed-off-by Tom St Denis <[email protected]>--- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 14 +++++++++--- -- 1 file changed, 9 insertions(+), 5 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 +0
-2for (i =0 ; i < smumgr->usec_timeout; i++) {@@ -275,8 +272,15 @@ static int cz_start_smu(struct pp_smumgr *smumgr)if (smumgr->chip_id ==CHIP_STONEY ) 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);
drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c static int cz_start_smu(struct pp_smumgr *smumgr) · line 285
Quoted 10 lines
drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +9
-0+ ret =cz_request_smu_load_fw (smumgr); +if (ret) { +printk (KERN_ERR "[ powerplay] SMU firmware load failed\n"); +return ret; + } + + ret =cz_check_fw_load_finish (smumgr, fw_to_check); +if (ret) +return ret;
I don't think we actually want to return early here. I think just printing an error message is enough.
Alex
Quoted 10 lines
drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +0
-0ret =cz_load_mec_firmware (smumgr);if (ret)
--
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