drm/tegra: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()

As requested in Documentation/gpu/todo.rst, replace driver calls to
drm_modeset_lock_all() with DRM_MODESET_LOCK_ALL_BEGIN() and
DRM_MODESET_LOCK_ALL_END()

Signed-off-by: Fernando Ramos <greenfoo@u92.eu>
Reviewed-by: Sean Paul <sean@poorly.run>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210924064324.229457-7-greenfoo@u92.eu

diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
index f46d377f0c3046309c2bf1d12415f593f6aed467..28050c188c1c45bba8bfe3bdef486e6cff722e84 100644 (file)
--- a/drivers/gpu/drm/tegra/dsi.c
+++ b/drivers/gpu/drm/tegra/dsi.c
@@ -23,6 +23,7 @@
 #include <drm/drm_mipi_dsi.h>
 #include <drm/drm_panel.h>
 #include <drm/drm_simple_kms_helper.h>
+#include <drm/drm_drv.h>
 
 #include "dc.h"
 #include "drm.h"
@@ -202,10 +203,11 @@ static int tegra_dsi_show_regs(struct seq_file *s, void *data)
        struct tegra_dsi *dsi = node->info_ent->data;
        struct drm_crtc *crtc = dsi->output.encoder.crtc;
        struct drm_device *drm = node->minor->dev;
+       struct drm_modeset_acquire_ctx ctx;
        unsigned int i;
        int err = 0;
 
-       drm_modeset_lock_all(drm);
+       DRM_MODESET_LOCK_ALL_BEGIN(drm, ctx, 0, err);
 
        if (!crtc || !crtc->state->active) {
                err = -EBUSY;
@@ -220,7 +222,7 @@ static int tegra_dsi_show_regs(struct seq_file *s, void *data)
        }
 
 unlock:
-       drm_modeset_unlock_all(drm);
+       DRM_MODESET_LOCK_ALL_END(drm, ctx, err);
        return err;
 }
 

diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
index e5d2a40260288742fd956931fd48416f46bdd1b5..a62de7f924147b415582c6fc6005502fabec0a35 100644 (file)
--- a/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
@@ -22,6 +22,7 @@
 #include <drm/drm_fourcc.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_simple_kms_helper.h>
+#include <drm/drm_drv.h>
 
 #include "hda.h"
 #include "hdmi.h"
@@ -1031,10 +1032,11 @@ static int tegra_hdmi_show_regs(struct seq_file *s, void *data)
        struct tegra_hdmi *hdmi = node->info_ent->data;
        struct drm_crtc *crtc = hdmi->output.encoder.crtc;
        struct drm_device *drm = node->minor->dev;
+       struct drm_modeset_acquire_ctx ctx;
        unsigned int i;
        int err = 0;
 
-       drm_modeset_lock_all(drm);
+       DRM_MODESET_LOCK_ALL_BEGIN(drm, ctx, 0, err);
 
        if (!crtc || !crtc->state->active) {
                err = -EBUSY;
@@ -1049,7 +1051,7 @@ static int tegra_hdmi_show_regs(struct seq_file *s, void *data)
        }
 
 unlock:
-       drm_modeset_unlock_all(drm);
+       DRM_MODESET_LOCK_ALL_END(drm, ctx, err);
        return err;
 }
 

diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index 0ea320c1092bd2e68308f546037d0af7375d6b0c..3d1c8b3d13589e5c06509f3e4828c2cc9ff944fc 100644 (file)
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -23,6 +23,7 @@
 #include <drm/drm_panel.h>
 #include <drm/drm_scdc_helper.h>
 #include <drm/drm_simple_kms_helper.h>
+#include <drm/drm_drv.h>
 
 #include "dc.h"
 #include "dp.h"
@@ -1490,10 +1491,11 @@ static int tegra_sor_show_crc(struct seq_file *s, void *data)
        struct tegra_sor *sor = node->info_ent->data;
        struct drm_crtc *crtc = sor->output.encoder.crtc;
        struct drm_device *drm = node->minor->dev;
+       struct drm_modeset_acquire_ctx ctx;
        int err = 0;
        u32 value;
 
-       drm_modeset_lock_all(drm);
+       DRM_MODESET_LOCK_ALL_BEGIN(drm, ctx, 0, err);
 
        if (!crtc || !crtc->state->active) {
                err = -EBUSY;
@@ -1522,7 +1524,7 @@ static int tegra_sor_show_crc(struct seq_file *s, void *data)
        seq_printf(s, "%08x\n", value);
 
 unlock:
-       drm_modeset_unlock_all(drm);
+       DRM_MODESET_LOCK_ALL_END(drm, ctx, err);
        return err;
 }
 
@@ -1652,10 +1654,11 @@ static int tegra_sor_show_regs(struct seq_file *s, void *data)
        struct tegra_sor *sor = node->info_ent->data;
        struct drm_crtc *crtc = sor->output.encoder.crtc;
        struct drm_device *drm = node->minor->dev;
+       struct drm_modeset_acquire_ctx ctx;
        unsigned int i;
        int err = 0;
 
-       drm_modeset_lock_all(drm);
+       DRM_MODESET_LOCK_ALL_BEGIN(drm, ctx, 0, err);
 
        if (!crtc || !crtc->state->active) {
                err = -EBUSY;
@@ -1670,7 +1673,7 @@ static int tegra_sor_show_regs(struct seq_file *s, void *data)
        }
 
 unlock:
-       drm_modeset_unlock_all(drm);
+       DRM_MODESET_LOCK_ALL_END(drm, ctx, err);
        return err;
 }