[PATCH v6 10/16] drm/bridge: ti-sn65dsi83: Switch to drm_bridge_helper_reset_crtc

[Maxime Ripard]

Now that we have a helper for bridge drivers to call to reset the output
pipeline, let's use it.

Reviewed-by: Dmitry Baryshkov <dmitry.barysh...@linaro.org>
Reviewed-by: Herve Codina <herve.cod...@bootlin.com>
Tested-by: Herve Codina <herve.cod...@bootlin.com>
Signed-off-by: Maxime Ripard <mrip...@kernel.org>
---
 drivers/gpu/drm/bridge/ti-sn65dsi83.c | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi83.c 
b/drivers/gpu/drm/bridge/ti-sn65dsi83.c
index 
7122a3ebd88399ed32420fcaf9f1f9384d031d2d..53cc4cfb0c884f6a410e3df2c4df4572f89c0768
 100644
--- a/drivers/gpu/drm/bridge/ti-sn65dsi83.c
+++ b/drivers/gpu/drm/bridge/ti-sn65dsi83.c
@@ -38,11 +38,11 @@
 #include <linux/timer.h>
 #include <linux/workqueue.h>
 
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_bridge.h>
-#include <drm/drm_drv.h> /* DRM_MODESET_LOCK_ALL_BEGIN() needs 
drm_drv_uses_atomic_modeset() */
+#include <drm/drm_bridge_helper.h>
 #include <drm/drm_mipi_dsi.h>
 #include <drm/drm_of.h>
 #include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 
@@ -369,11 +369,10 @@ static u8 sn65dsi83_get_dsi_div(struct sn65dsi83 *ctx)
        return dsi_div - 1;
 }
 
 static int sn65dsi83_reset_pipe(struct sn65dsi83 *sn65dsi83)
 {
-       struct drm_device *dev = sn65dsi83->bridge.dev;
        struct drm_modeset_acquire_ctx ctx;
        int err;
 
        /*
         * Reset active outputs of the related CRTC.
@@ -384,30 +383,25 @@ static int sn65dsi83_reset_pipe(struct sn65dsi83 
*sn65dsi83)
         * bridge.
         *
         * Keep the lock during the whole operation to be atomic.
         */
 
-       DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, err);
-
-       if (!sn65dsi83->bridge.encoder->crtc) {
-               /*
-                * No CRTC attached -> No CRTC active outputs to reset
-                * This can happen when the SN65DSI83 is reset. Simply do
-                * nothing without returning any errors.
-                */
-               err = 0;
-               goto end;
-       }
+       drm_modeset_acquire_init(&ctx, 0);
 
        dev_warn(sn65dsi83->dev, "reset the pipe\n");
 
-       err = drm_atomic_helper_reset_crtc(sn65dsi83->bridge.encoder->crtc, 
&ctx);
+retry:
+       err = drm_bridge_helper_reset_crtc(&sn65dsi83->bridge, &ctx);
+       if (err == -EDEADLK) {
+               drm_modeset_backoff(&ctx);
+               goto retry;
+       }
 
-end:
-       DRM_MODESET_LOCK_ALL_END(dev, ctx, err);
+       drm_modeset_drop_locks(&ctx);
+       drm_modeset_acquire_fini(&ctx);
 
-       return err;
+       return 0;
 }
 
 static void sn65dsi83_reset_work(struct work_struct *ws)
 {
        struct sn65dsi83 *ctx = container_of(ws, struct sn65dsi83, reset_work);

-- 
2.48.1