drm/omap: Fix runtime PM imbalance on error

pm_runtime_get_sync() increments the runtime PM usage counter
even when it returns an error code. However, users of its
direct wrappers in omapdrm assume that PM usage counter will
not change on error. Thus a pairing decrement is needed on
the error handling path for these wrappers to keep the counter
balanced.

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200822065743.13671-1-dinghao.liu@zju.edu.cn

diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c
index 48593932bddf55df24c5354bd35ae75a6b827f98..599183879caf628bb01912f2150377c36f8905ad 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dispc.c
+++ b/drivers/gpu/drm/omapdrm/dss/dispc.c
@@ -653,8 +653,11 @@ int dispc_runtime_get(struct dispc_device *dispc)
        DSSDBG("dispc_runtime_get\n");
 
        r = pm_runtime_get_sync(&dispc->pdev->dev);
-       WARN_ON(r < 0);
-       return r < 0 ? r : 0;
+       if (WARN_ON(r < 0)) {
+               pm_runtime_put_noidle(&dispc->pdev->dev);
+               return r;
+       }
+       return 0;
 }
 
 void dispc_runtime_put(struct dispc_device *dispc)

diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 5929b320b3cfaf67445949e12a712f4e0e59ca1d..735a4e9027d0c38e138fbc5c1b6941c8e8b26826 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -1112,8 +1112,11 @@ static int dsi_runtime_get(struct dsi_data *dsi)
        DSSDBG("dsi_runtime_get\n");
 
        r = pm_runtime_get_sync(dsi->dev);
-       WARN_ON(r < 0);
-       return r < 0 ? r : 0;
+       if (WARN_ON(r < 0)) {
+               pm_runtime_put_noidle(dsi->dev);
+               return r;
+       }
+       return 0;
 }
 
 static void dsi_runtime_put(struct dsi_data *dsi)

diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c
index 6ccbc29c4ce4bbbdc8950e4041620e061166ffa1..d7b2f5bcac1698393f92ab18208e063732b9fc3c 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -858,8 +858,11 @@ int dss_runtime_get(struct dss_device *dss)
        DSSDBG("dss_runtime_get\n");
 
        r = pm_runtime_get_sync(&dss->pdev->dev);
-       WARN_ON(r < 0);
-       return r < 0 ? r : 0;
+       if (WARN_ON(r < 0)) {
+               pm_runtime_put_noidle(&dss->pdev->dev);
+               return r;
+       }
+       return 0;
 }
 
 void dss_runtime_put(struct dss_device *dss)

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
index ba4a21d2579616dda28431649eb83fc92babfc0b..8de41e74e8f8e3ce92729eed01d50c8deb366e5f 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
@@ -43,10 +43,10 @@ static int hdmi_runtime_get(struct omap_hdmi *hdmi)
        DSSDBG("hdmi_runtime_get\n");
 
        r = pm_runtime_get_sync(&hdmi->pdev->dev);
-       WARN_ON(r < 0);
-       if (r < 0)
+       if (WARN_ON(r < 0)) {
+               pm_runtime_put_noidle(&hdmi->pdev->dev);
                return r;
-
+       }
        return 0;
 }
 

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index 045aa445c737f3f78c85357f601d66d3450196a5..54e5cb5aa52de9263ef7420fc523f8906aec3b49 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -44,10 +44,10 @@ static int hdmi_runtime_get(struct omap_hdmi *hdmi)
        DSSDBG("hdmi_runtime_get\n");
 
        r = pm_runtime_get_sync(&hdmi->pdev->dev);
-       WARN_ON(r < 0);
-       if (r < 0)
+       if (WARN_ON(r < 0)) {
+               pm_runtime_put_noidle(&hdmi->pdev->dev);
                return r;
-
+       }
        return 0;
 }
 

diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index 5c027c81760f47861f04baa4f03d0620bece6eb5..94cf50d837b0719daae010a7230ce3865e43c950 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -361,8 +361,11 @@ static int venc_runtime_get(struct venc_device *venc)
        DSSDBG("venc_runtime_get\n");
 
        r = pm_runtime_get_sync(&venc->pdev->dev);
-       WARN_ON(r < 0);
-       return r < 0 ? r : 0;
+       if (WARN_ON(r < 0)) {
+               pm_runtime_put_noidle(&venc->pdev->dev);
+               return r;
+       }
+       return 0;
 }
 
 static void venc_runtime_put(struct venc_device *venc)