]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
drm/etnaviv: fix missing unlock on error in etnaviv_gpu_submit()
authorWei Yongjun <weiyongjun1@huawei.com>
Wed, 12 Apr 2017 00:31:16 +0000 (00:31 +0000)
committerThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Wed, 17 May 2017 16:37:10 +0000 (13:37 -0300)
BugLink: http://bugs.launchpad.net/bugs/1687045
commit 45abdf35cf82e4270328c7237e7812de960ac560 upstream.

Add the missing unlock before return from function etnaviv_gpu_submit()
in the error handling case.

lst: fixed label name.

Fixes: f3cd1b064f11 ("drm/etnaviv: (re-)protect fence allocation with GPU mutex")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
drivers/gpu/drm/etnaviv/etnaviv_gpu.c

index db0a43a090d04f5c7ce3ebad1c2e1f5cc2d3c5bb..34ffe6e1f6d08bb61671a8668e04f5a43659052c 100644 (file)
@@ -1309,7 +1309,7 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu,
        if (!fence) {
                event_free(gpu, event);
                ret = -ENOMEM;
-               goto out_pm_put;
+               goto out_unlock;
        }
 
        gpu->event[event].fence = fence;
@@ -1349,6 +1349,7 @@ int etnaviv_gpu_submit(struct etnaviv_gpu *gpu,
        hangcheck_timer_reset(gpu);
        ret = 0;
 
+out_unlock:
        mutex_unlock(&gpu->lock);
 
 out_pm_put: