* [PATCH] drm/etnaviv: fix missing unlock on error in etnaviv_gpu_submit()
@ 2017-04-12 0:31 Wei Yongjun
2017-04-12 9:53 ` Lucas Stach
0 siblings, 1 reply; 3+ messages in thread
From: Wei Yongjun @ 2017-04-12 0:31 UTC (permalink / raw)
To: Lucas Stach, Russell King, Christian Gmeiner, David Airlie
Cc: Wei Yongjun, etnaviv, dri-devel, linux-kernel
From: Wei Yongjun <weiyongjun1@huawei.com>
Add the missing unlock before return from function etnaviv_gpu_submit()
in the error handling case.
Fixes: f3cd1b064f11 ("drm/etnaviv: (re-)protect fence allocation with
GPU mutex")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index da48819..e4a4d4c 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -1317,7 +1317,7 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu,
if (!fence) {
event_free(gpu, event);
ret = -ENOMEM;
- goto out_pm_put;
+ goto out_unlok;
}
gpu->event[event].fence = fence;
@@ -1357,6 +1357,7 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu,
hangcheck_timer_reset(gpu);
ret = 0;
+out_unlok:
mutex_unlock(&gpu->lock);
out_pm_put:
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/etnaviv: fix missing unlock on error in etnaviv_gpu_submit()
2017-04-12 0:31 [PATCH] drm/etnaviv: fix missing unlock on error in etnaviv_gpu_submit() Wei Yongjun
@ 2017-04-12 9:53 ` Lucas Stach
0 siblings, 0 replies; 3+ messages in thread
From: Lucas Stach @ 2017-04-12 9:53 UTC (permalink / raw)
To: Wei Yongjun
Cc: Russell King, Christian Gmeiner, David Airlie, Wei Yongjun,
etnaviv, dri-devel, linux-kernel
Am Mittwoch, den 12.04.2017, 00:31 +0000 schrieb Wei Yongjun:
> From: Wei Yongjun <weiyongjun1@huawei.com>
>
> Add the missing unlock before return from function etnaviv_gpu_submit()
> in the error handling case.
>
> Fixes: f3cd1b064f11 ("drm/etnaviv: (re-)protect fence allocation with
> GPU mutex")
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> ---
> drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
> index da48819..e4a4d4c 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
> @@ -1317,7 +1317,7 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu,
> if (!fence) {
> event_free(gpu, event);
> ret = -ENOMEM;
> - goto out_pm_put;
> + goto out_unlok;
Label should probably be named "out_unlock". Fixed up while applying,
thanks.
Regards,
Lucas
> }
>
> gpu->event[event].fence = fence;
> @@ -1357,6 +1357,7 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu,
> hangcheck_timer_reset(gpu);
> ret = 0;
>
> +out_unlok:
> mutex_unlock(&gpu->lock);
>
> out_pm_put:
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/etnaviv: fix missing unlock on error in etnaviv_gpu_submit()
@ 2017-04-12 9:53 ` Lucas Stach
0 siblings, 0 replies; 3+ messages in thread
From: Lucas Stach @ 2017-04-12 9:53 UTC (permalink / raw)
To: Wei Yongjun; +Cc: etnaviv, dri-devel, linux-kernel, Wei Yongjun, Russell King
Am Mittwoch, den 12.04.2017, 00:31 +0000 schrieb Wei Yongjun:
> From: Wei Yongjun <weiyongjun1@huawei.com>
>
> Add the missing unlock before return from function etnaviv_gpu_submit()
> in the error handling case.
>
> Fixes: f3cd1b064f11 ("drm/etnaviv: (re-)protect fence allocation with
> GPU mutex")
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> ---
> drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
> index da48819..e4a4d4c 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
> @@ -1317,7 +1317,7 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu,
> if (!fence) {
> event_free(gpu, event);
> ret = -ENOMEM;
> - goto out_pm_put;
> + goto out_unlok;
Label should probably be named "out_unlock". Fixed up while applying,
thanks.
Regards,
Lucas
> }
>
> gpu->event[event].fence = fence;
> @@ -1357,6 +1357,7 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu,
> hangcheck_timer_reset(gpu);
> ret = 0;
>
> +out_unlok:
> mutex_unlock(&gpu->lock);
>
> out_pm_put:
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-04-12 9:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-12 0:31 [PATCH] drm/etnaviv: fix missing unlock on error in etnaviv_gpu_submit() Wei Yongjun
2017-04-12 9:53 ` Lucas Stach
2017-04-12 9:53 ` Lucas Stach
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.