drm/amd/powerplay: Fix CZ SMU firmware load check (v4)
Subsystems (2)
PATCH 1/1 drm/amd/powerplay: Fix CZ SMU firmware load check (v4)
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() (v3) Don't return early if SMU load check fails (v4) No returns! :-)
--- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +4 -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++) {
@@ -275,7 +272,10 @@ 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); + ret =cz_request_smu_load_fw (smumgr); +if (ret) +printk (KERN_ERR "[ powerplay] SMU firmware load failed\n" ); +cz_check_fw_load_finish (smumgr, fw_to_check); ret =cz_load_mec_firmware (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]
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 12 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Friday, August 26, 2016 11:13 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH] drm/amd/powerplay: Fix CZ SMU firmware load check (v4)Remove an errant return in the middle of the check function as well as check for success in the start function.
Quoted 5 lines
(v2) Add return check to
smu_load_fw()
(v3) Don't return early if SMU load check fails
(v4) No returns! :-)Signed-off-by Tom St Denis <[email protected]>
Both v1 and v4 are:
:)
Quoted 34 lines
--- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 8 ++++---- 1 file changed, 4 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 +4
-1for (i =0 ; i < smumgr->usec_timeout; i++) {@@ -275,7 +272,10 @@ 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); + ret =cz_request_smu_load_fw (smumgr); +if (ret) +printk (KERN_ERR "[ powerplay] SMU firmware load failed\n"); +cz_check_fw_load_finish (smumgr, fw_to_check);
Quoted 8 lines
ret =
cz_load_mec_firmware(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
A message that is not in the archive (sent off-list or not yet received): MWHPR12MB1694DC6A5DD1955660EA370BF7EC0-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
StDenis, Tom
Reviewed-by Alex DeucherThanks. I like v4 better because it prints a message if the initial load op fails. I'll push that.
Tom
________________________________
From: Deucher, Alexander
Sent: Friday, August 26, 2016 11:15
To: 'Tom St Denis'; [email protected]
Cc: StDenis, Tom
Subject: RE: [PATCH] drm/amd/powerplay: Fix CZ SMU firmware load check (v4)
Quoted 12 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 11:13 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH] drm/amd/powerplay: Fix CZ SMU firmware load check (v4)Remove an errant return in the middle of the check function as well as check for success in the start function.
Quoted 5 lines
(v2) Add return check to
smu_load_fw()
(v3) Don't return early if SMU load check fails
(v4) No returns! :-)Signed-off-by Tom St Denis <[email protected]>
Both v1 and v4 are:
:)
Quoted 34 lines
--- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 8 ++++---- 1 file changed, 4 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 +4
-1@@ -275,7 +272,10 @@ 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); + ret =cz_request_smu_load_fw (smumgr); +if (ret) +printk (KERN_ERR "[ powerplay] SMU firmware load failed\n"); +cz_check_fw_load_finish (smumgr, fw_to_check);
Quoted 8 lines
ret = cz_load_mec_firmware(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