* [PATCH] drm/amd/powerplay: unlock on error in smu_resume()
@ 2019-10-07 9:04 ` Dan Carpenter
0 siblings, 0 replies; 5+ messages in thread
From: Dan Carpenter @ 2019-10-07 9:04 UTC (permalink / raw)
To: Rex Zhu, Evan Quan
Cc: David (ChunMing) Zhou, David Airlie,
kernel-janitors-u79uwXL29TY76Z2rM5mHXA,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Daniel Vetter,
Alex Deucher, Christian König
This function needs to drop the mutex before returning.
Fixes: f7e3a5776fa6 ("drm/amd/powerplay: check SMU engine readiness before proceeding on S3 resume")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
index 6a64f765fcd4..f1fbbc8b77ee 100644
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
@@ -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
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH] drm/amd/powerplay: unlock on error in smu_resume() @ 2019-10-07 9:04 ` Dan Carpenter 0 siblings, 0 replies; 5+ messages in thread From: Dan Carpenter @ 2019-10-07 9:04 UTC (permalink / raw) To: Rex Zhu, Evan Quan Cc: David (ChunMing) Zhou, David Airlie, kernel-janitors-u79uwXL29TY76Z2rM5mHXA, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Daniel Vetter, Alex Deucher, Christian König This function needs to drop the mutex before returning. Fixes: f7e3a5776fa6 ("drm/amd/powerplay: check SMU engine readiness before proceeding on S3 resume") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c index 6a64f765fcd4..f1fbbc8b77ee 100644 --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c @@ -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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/amd/powerplay: unlock on error in smu_resume() 2019-10-07 9:04 ` Dan Carpenter (?) @ 2019-10-07 10:28 ` Wang, Kevin(Yang) 2019-10-07 16:23 ` Alex Deucher -1 siblings, 1 reply; 5+ messages in thread From: Wang, Kevin(Yang) @ 2019-10-07 10:28 UTC (permalink / raw) To: Dan Carpenter, Rex Zhu, Quan, Evan Cc: David Airlie, kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, Deucher, Alexander, Koenig, Christian [-- Attachment #1.1: Type: text/plain, Size: 1833 bytes --] Reviewed-by: Kevin Wang <kevin1.wang@amd.com> Best Regards, Kevin ________________________________ From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Dan Carpenter <dan.carpenter@oracle.com> Sent: Monday, October 7, 2019 5:04 PM To: Rex Zhu <rex.zhu@amd.com>; Quan, Evan <Evan.Quan@amd.com> Cc: Zhou, David(ChunMing) <David1.Zhou@amd.com>; David Airlie <airlied@linux.ie>; kernel-janitors@vger.kernel.org <kernel-janitors@vger.kernel.org>; amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>; dri-devel@lists.freedesktop.org <dri-devel@lists.freedesktop.org>; Daniel Vetter <daniel@ffwll.ch>; Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com> 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") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c index 6a64f765fcd4..f1fbbc8b77ee 100644 --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c @@ -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 amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx [-- Attachment #1.2: Type: text/html, Size: 3476 bytes --] [-- Attachment #2: Type: text/plain, Size: 159 bytes --] _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/amd/powerplay: unlock on error in smu_resume() 2019-10-07 10:28 ` Wang, Kevin(Yang) @ 2019-10-07 16:23 ` Alex Deucher 0 siblings, 0 replies; 5+ messages in thread From: Alex Deucher @ 2019-10-07 16:23 UTC (permalink / raw) To: Wang, Kevin(Yang) Cc: David Airlie, kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, Deucher, Alexander, Quan, Evan, Rex Zhu, Koenig, Christian, Dan Carpenter Applied. thanks! Alex On Mon, Oct 7, 2019 at 6:29 AM Wang, Kevin(Yang) <Kevin1.Wang@amd.com> wrote: > > Reviewed-by: Kevin Wang <kevin1.wang@amd.com> > > Best Regards, > Kevin > ________________________________ > From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Dan Carpenter <dan.carpenter@oracle.com> > Sent: Monday, October 7, 2019 5:04 PM > To: Rex Zhu <rex.zhu@amd.com>; Quan, Evan <Evan.Quan@amd.com> > Cc: Zhou, David(ChunMing) <David1.Zhou@amd.com>; David Airlie <airlied@linux.ie>; kernel-janitors@vger.kernel.org <kernel-janitors@vger.kernel.org>; amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>; dri-devel@lists.freedesktop.org <dri-devel@lists.freedesktop.org>; Daniel Vetter <daniel@ffwll.ch>; Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com> > 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") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c > index 6a64f765fcd4..f1fbbc8b77ee 100644 > --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c > +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c > @@ -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 > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/amd/powerplay: unlock on error in smu_resume() @ 2019-10-07 16:23 ` Alex Deucher 0 siblings, 0 replies; 5+ messages in thread From: Alex Deucher @ 2019-10-07 16:23 UTC (permalink / raw) To: Wang, Kevin(Yang) Cc: David Airlie, kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, Deucher, Alexander, Quan, Evan, Rex Zhu, Koenig, Christian, Dan Carpenter Applied. thanks! Alex On Mon, Oct 7, 2019 at 6:29 AM Wang, Kevin(Yang) <Kevin1.Wang@amd.com> wrote: > > Reviewed-by: Kevin Wang <kevin1.wang@amd.com> > > Best Regards, > Kevin > ________________________________ > From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Dan Carpenter <dan.carpenter@oracle.com> > Sent: Monday, October 7, 2019 5:04 PM > To: Rex Zhu <rex.zhu@amd.com>; Quan, Evan <Evan.Quan@amd.com> > Cc: Zhou, David(ChunMing) <David1.Zhou@amd.com>; David Airlie <airlied@linux.ie>; kernel-janitors@vger.kernel.org <kernel-janitors@vger.kernel.org>; amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>; dri-devel@lists.freedesktop.org <dri-devel@lists.freedesktop.org>; Daniel Vetter <daniel@ffwll.ch>; Deucher, Alexander <Alexander.Deucher@amd.com>; Koenig, Christian <Christian.Koenig@amd.com> > 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") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c > index 6a64f765fcd4..f1fbbc8b77ee 100644 > --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c > +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c > @@ -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 > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-10-07 16:23 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-10-07 9:04 [PATCH] drm/amd/powerplay: unlock on error in smu_resume() Dan Carpenter 2019-10-07 9:04 ` Dan Carpenter 2019-10-07 10:28 ` Wang, Kevin(Yang) 2019-10-07 16:23 ` Alex Deucher 2019-10-07 16:23 ` Alex Deucher
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.