Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1621711 > unrolled thread
| Started by | Wei Yongjun <weiyj.lk@gmail.com> |
|---|---|
| First post | 2017-04-12 02:40 +0200 |
| Last post | 2017-04-12 12:00 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] drm/etnaviv: fix missing unlock on error in etnaviv_gpu_submit() Wei Yongjun <weiyj.lk@gmail.com> - 2017-04-12 02:40 +0200
Re: [PATCH] drm/etnaviv: fix missing unlock on error in etnaviv_gpu_submit() Lucas Stach <l.stach@pengutronix.de> - 2017-04-12 12:00 +0200
| From | Wei Yongjun <weiyj.lk@gmail.com> |
|---|---|
| Date | 2017-04-12 02:40 +0200 |
| Subject | [PATCH] drm/etnaviv: fix missing unlock on error in etnaviv_gpu_submit() |
| Message-ID | <tveue-5Po-1@gated-at.bofh.it> |
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:
[toc] | [next] | [standalone]
| From | Lucas Stach <l.stach@pengutronix.de> |
|---|---|
| Date | 2017-04-12 12:00 +0200 |
| Subject | Re: [PATCH] drm/etnaviv: fix missing unlock on error in etnaviv_gpu_submit() |
| Message-ID | <tvnea-2SU-11@gated-at.bofh.it> |
| In reply to | #1621711 |
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:
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web