drm/tidss: Return error value from from softreset

[ Upstream commit aceafbb5035c4bfc75a321863ed1e393d644d2d2 ]

Return an error value from dispc_softreset() so that the caller can
handle the errors.

Reviewed-by: Aradhya Bhatia <a-bhatia1@ti.com>
Link: https://lore.kernel.org/r/20231109-tidss-probe-v2-5-ac91b5ea35c0@ideasonboard.com
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Stable-dep-of: bc288a927815 ("drm/tidss: Fix dss reset")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/tidss/tidss_dispc.c b/drivers/gpu/drm/tidss/tidss_dispc.c
index 8d82237..9a29f5f 100644 (file)
--- a/drivers/gpu/drm/tidss/tidss_dispc.c
+++ b/drivers/gpu/drm/tidss/tidss_dispc.c
@@ -2702,7 +2702,7 @@ static void dispc_init_errata(struct dispc_device *dispc)
        }
 }
 
-static void dispc_softreset(struct dispc_device *dispc)
+static int dispc_softreset(struct dispc_device *dispc)
 {
        u32 val;
        int ret = 0;
@@ -2712,8 +2712,12 @@ static void dispc_softreset(struct dispc_device *dispc)
        /* Wait for reset to complete */
        ret = readl_poll_timeout(dispc->base_common + DSS_SYSSTATUS,
                                 val, val & 1, 100, 5000);
-       if (ret)
-               dev_warn(dispc->dev, "failed to reset dispc\n");
+       if (ret) {
+               dev_err(dispc->dev, "failed to reset dispc\n");
+               return ret;
+       }
+
+       return 0;
 }
 
 int dispc_init(struct tidss_device *tidss)
@@ -2826,8 +2830,11 @@ int dispc_init(struct tidss_device *tidss)
                             &dispc->memory_bandwidth_limit);
 
        /* K2G display controller does not support soft reset */
-       if (feat->subrev != DISPC_K2G)
-               dispc_softreset(dispc);
+       if (feat->subrev != DISPC_K2G) {
+               r = dispc_softreset(dispc);
+               if (r)
+                       return r;
+       }
 
        tidss->dispc = dispc;