* [PATCH 2/2] drm/amd/powerplay: fix a couple locking issues
@ 2017-04-03 18:42 Dan Carpenter
2017-04-03 20:33 ` Alex Deucher
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2017-04-03 18:42 UTC (permalink / raw)
To: Alex Deucher
Cc: Christian König, David Airlie, Rex Zhu, Eric Huang,
Tom St Denis, Huang Rui, Monk Liu, amd-gfx, dri-devel,
kernel-janitors
We should return unlock on the error path in pp_dpm_dispatch_tasks()
and there is a double lock bug in pp_dpm_set_sclk_od().
Fixes: 2a5071056e6a ("drm/amd/powerplay: add global PowerPlay mutex.")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
index 260b732be7c3..e59b5627d543 100644
--- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
+++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
@@ -493,8 +493,10 @@ static int pp_dpm_dispatch_tasks(void *handle, enum amd_pp_event event_id,
{
enum amd_pm_state_type ps;
- if (input = NULL)
- return -EINVAL;
+ if (input = NULL) {
+ ret = -EINVAL;
+ break;
+ }
ps = *(unsigned long *)input;
data.requested_ui_label = power_state_convert(ps);
@@ -897,7 +899,7 @@ static int pp_dpm_set_sclk_od(void *handle, uint32_t value)
mutex_lock(&pp_handle->pp_lock);
ret = hwmgr->hwmgr_func->set_sclk_od(hwmgr, value);
- mutex_lock(&pp_handle->pp_lock);
+ mutex_unlock(&pp_handle->pp_lock);
return ret;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 2/2] drm/amd/powerplay: fix a couple locking issues
2017-04-03 18:42 [PATCH 2/2] drm/amd/powerplay: fix a couple locking issues Dan Carpenter
@ 2017-04-03 20:33 ` Alex Deucher
0 siblings, 0 replies; 2+ messages in thread
From: Alex Deucher @ 2017-04-03 20:33 UTC (permalink / raw)
To: Dan Carpenter
Cc: Tom St Denis, kernel-janitors, Maling list - DRI developers,
Eric Huang, Huang Rui, amd-gfx list, Alex Deucher, Rex Zhu,
Christian König, Monk Liu
On Mon, Apr 3, 2017 at 2:42 PM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> We should return unlock on the error path in pp_dpm_dispatch_tasks()
> and there is a double lock bug in pp_dpm_set_sclk_od().
>
> Fixes: 2a5071056e6a ("drm/amd/powerplay: add global PowerPlay mutex.")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied. thanks!
Alex
>
> diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
> index 260b732be7c3..e59b5627d543 100644
> --- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
> +++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
> @@ -493,8 +493,10 @@ static int pp_dpm_dispatch_tasks(void *handle, enum amd_pp_event event_id,
> {
> enum amd_pm_state_type ps;
>
> - if (input = NULL)
> - return -EINVAL;
> + if (input = NULL) {
> + ret = -EINVAL;
> + break;
> + }
> ps = *(unsigned long *)input;
>
> data.requested_ui_label = power_state_convert(ps);
> @@ -897,7 +899,7 @@ static int pp_dpm_set_sclk_od(void *handle, uint32_t value)
>
> mutex_lock(&pp_handle->pp_lock);
> ret = hwmgr->hwmgr_func->set_sclk_od(hwmgr, value);
> - mutex_lock(&pp_handle->pp_lock);
> + mutex_unlock(&pp_handle->pp_lock);
> return ret;
> }
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-04-03 20:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-03 18:42 [PATCH 2/2] drm/amd/powerplay: fix a couple locking issues Dan Carpenter
2017-04-03 20:33 ` Alex Deucher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox