Skip to contentSkip to conversation

drm/amd/powerplay: unlock on error in smu_resume()

PATCH Applied Dan Carpenter 3 participants 3 messages Oct 7, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amd/powerplay: unlock on error in smu_resume()

This function needs to drop the mutex before returning.

Fixes f7e3a5776fa6 ("drm/amd/powerplay: check SMU engine readiness before proceeding on S3 resume")
---
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +1 -1
index 6a64f765fcd4..f1fbbc8b77ee 100644
@@ -1384,7 +1384,7 @@ static int smu_resume(void *handle)
 	ret = smu_start_smc_engine(smu);
 	if (ret) {
 		pr_err("SMU is not ready yet!\n");
-		return ret;
+		goto failed;
 	}
 
 	ret = smu_smc_table_hw_init(smu, false);
Signature · 6 lines
2.20.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Reviewed-by on v1 1/1
#1 lore raw

Best Regards,
Kevin
________________________________
From: amd-gfx <[email protected]> on behalf of Dan Carpenter <[email protected]>
Sent: Monday, October 7, 2019 5:04 PM
To: Rex Zhu <[email protected]>; Quan, Evan <[email protected]>
Cc: Zhou, David(ChunMing) <[email protected]>; David Airlie <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; Daniel Vetter <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>
Subject: [PATCH] drm/amd/powerplay: unlock on error in smu_resume()

This function needs to drop the mutex before returning.

Fixes f7e3a5776fa6 ("drm/amd/powerplay: check SMU engine readiness before proceeding on S3 resume")
---
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +1 -1
index 6a64f765fcd4..f1fbbc8b77ee 100644
@@ -1384,7 +1384,7 @@ static int smu_resume(void *handle)
         ret = smu_start_smc_engine(smu);
         if (ret) {
                 pr_err("SMU is not ready yet!\n");
-               return ret;
+               goto failed;
         }
 
         ret = smu_smc_table_hw_init(smu, false);

--
2.20.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Applied
#2 lore raw

Applied. thanks!

Alex

Quoted 36 lines · Kevin(Yang)

Best Regards,
Kevin
________________________________
From: amd-gfx <[email protected]> on behalf of Dan Carpenter <[email protected]>
Sent: Monday, October 7, 2019 5:04 PM
To: Rex Zhu <[email protected]>; Quan, Evan <[email protected]>
Cc: Zhou, David(ChunMing) <[email protected]>; David Airlie <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; Daniel Vetter <[email protected]>; Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>
Subject: [PATCH] drm/amd/powerplay: unlock on error in smu_resume()

This function needs to drop the mutex before returning.

Fixes f7e3a5776fa6 ("drm/amd/powerplay: check SMU engine readiness before proceeding on S3 resume")
---
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +1 -2
index 6a64f765fcd4..f1fbbc8b77ee 100644
@@ -1384,7 +1384,7 @@ static int smu_resume(void *handle)
         ret = smu_start_smc_engine(smu);
         if (ret) {
                 pr_err("SMU is not ready yet!\n");
-               return ret;
+               goto failed;
         }
 
         ret = smu_smc_table_hw_init(smu, false);
--

2.20.1

Quoted 8 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel