drm/etnaviv: fix missing unlock on error in etnaviv_gpu_submit()
Subsystems (2)
PATCH 1/1 drm/etnaviv: fix missing unlock on error in etnaviv_gpu_submit()
From: Wei Yongjun <[email protected]>
Add the missing unlock before return from function etnaviv_gpu_submit() in the error handling case.
GPU mutex")
--- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +2 -1
@@ -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:
Lucas Stach
maintainerAm Mittwoch, den 12.04.2017, 00:31 +0000 schrieb Wei Yongjun:
Quoted 17 lines
From: Wei Yongjun <[email protected]>
Add the missing unlock before return from function
etnaviv_gpu_submit()in the error handling case.Fixes f3cd1b064f11 ("drm/etnaviv: (re-)protect fence allocation withGPU mutex")
Signed-off-by Wei Yongjun <[email protected]>--- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/etnaviv/etnaviv_gpu.c +0
-0
drivers/gpu/drm/etnaviv/etnaviv_gpu.c int etnaviv_gpu_submit(struct etnaviv_gpu *gpu, · line 1320
Quoted 5 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +1
-1@@ -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
drivers/gpu/drm/etnaviv/etnaviv_gpu.c int etnaviv_gpu_submit(struct etnaviv_gpu *gpu, · line 1363
Quoted 12 lines
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +1
-0} 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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel