drm/etnaviv: fix ref count leak via pm_runtime_get_sync

BugLink: https://bugs.launchpad.net/bugs/1892417
[ Upstream commit c5d5a32ead1e3a61a07a1e59eb52a53e4a6b2a7f ]

in etnaviv_gpu_submit, etnaviv_gpu_recover_hang, etnaviv_gpu_debugfs,
and etnaviv_gpu_init the call to pm_runtime_get_sync increments the
counter even in case of failure, leading to incorrect ref count.
In case of failure, decrement the ref count before returning.

Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index d47d1a8e02198efbbd683e7b3e7a1e1f50412ba0..8a26ea2a53348f31264badfea016ea69f2c3c5d7 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -713,7 +713,7 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu)
        ret = pm_runtime_get_sync(gpu->dev);
        if (ret < 0) {
                dev_err(gpu->dev, "Failed to enable GPU power domain\n");
-               return ret;
+               goto pm_put;
        }
 
        etnaviv_hw_identify(gpu);
@@ -802,6 +802,7 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu)
 
 fail:
        pm_runtime_mark_last_busy(gpu->dev);
+pm_put:
        pm_runtime_put_autosuspend(gpu->dev);
 
        return ret;
@@ -842,7 +843,7 @@ int etnaviv_gpu_debugfs(struct etnaviv_gpu *gpu, struct seq_file *m)
 
        ret = pm_runtime_get_sync(gpu->dev);
        if (ret < 0)
-               return ret;
+               goto pm_put;
 
        dma_lo = gpu_read(gpu, VIVS_FE_DMA_LOW);
        dma_hi = gpu_read(gpu, VIVS_FE_DMA_HIGH);
@@ -965,6 +966,7 @@ int etnaviv_gpu_debugfs(struct etnaviv_gpu *gpu, struct seq_file *m)
        ret = 0;
 
        pm_runtime_mark_last_busy(gpu->dev);
+pm_put:
        pm_runtime_put_autosuspend(gpu->dev);
 
        return ret;
@@ -978,7 +980,7 @@ void etnaviv_gpu_recover_hang(struct etnaviv_gpu *gpu)
        dev_err(gpu->dev, "recover hung GPU!\n");
 
        if (pm_runtime_get_sync(gpu->dev) < 0)
-               return;
+               goto pm_put;
 
        mutex_lock(&gpu->lock);
 
@@ -997,6 +999,7 @@ void etnaviv_gpu_recover_hang(struct etnaviv_gpu *gpu)
 
        mutex_unlock(&gpu->lock);
        pm_runtime_mark_last_busy(gpu->dev);
+pm_put:
        pm_runtime_put_autosuspend(gpu->dev);
 }
 
@@ -1269,8 +1272,10 @@ struct dma_fence *etnaviv_gpu_submit(struct etnaviv_gem_submit *submit)
 
        if (!submit->runtime_resumed) {
                ret = pm_runtime_get_sync(gpu->dev);
-               if (ret < 0)
+               if (ret < 0) {
+                       pm_runtime_put_noidle(gpu->dev);
                        return NULL;
+               }
                submit->runtime_resumed = true;
        }
 
@@ -1287,6 +1292,7 @@ struct dma_fence *etnaviv_gpu_submit(struct etnaviv_gem_submit *submit)
        ret = event_alloc(gpu, nr_events, event);
        if (ret) {
                DRM_ERROR("no free events\n");
+               pm_runtime_put_noidle(gpu->dev);
                return NULL;
        }