drm/nouveau: 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>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210924064324.229457-11-greenfoo@u92.eu

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index d7b9f7f..86e18a8 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -42,6 +42,7 @@
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_scdc_helper.h>
 #include <drm/drm_vblank.h>
+#include <drm/drm_drv.h>
 
 #include <nvif/push507c.h>
 
@@ -667,16 +668,18 @@ nv50_audio_component_bind(struct device *kdev, struct device *hda_kdev,
        struct drm_device *drm_dev = dev_get_drvdata(kdev);
        struct nouveau_drm *drm = nouveau_drm(drm_dev);
        struct drm_audio_component *acomp = data;
+       struct drm_modeset_acquire_ctx ctx;
+       int ret;
 
        if (WARN_ON(!device_link_add(hda_kdev, kdev, DL_FLAG_STATELESS)))
                return -ENOMEM;
 
-       drm_modeset_lock_all(drm_dev);
+       DRM_MODESET_LOCK_ALL_BEGIN(drm_dev, ctx, 0, ret);
        acomp->ops = &nv50_audio_component_ops;
        acomp->dev = kdev;
        drm->audio.component = acomp;
-       drm_modeset_unlock_all(drm_dev);
-       return 0;
+       DRM_MODESET_LOCK_ALL_END(drm_dev, ctx, ret);
+       return ret;
 }
 
 static void
@@ -686,12 +689,14 @@ nv50_audio_component_unbind(struct device *kdev, struct device *hda_kdev,
        struct drm_device *drm_dev = dev_get_drvdata(kdev);
        struct nouveau_drm *drm = nouveau_drm(drm_dev);
        struct drm_audio_component *acomp = data;
+       struct drm_modeset_acquire_ctx ctx;
+       int ret;
 
-       drm_modeset_lock_all(drm_dev);
+       DRM_MODESET_LOCK_ALL_BEGIN(drm_dev, ctx, 0, ret);
        drm->audio.component = NULL;
        acomp->ops = NULL;
        acomp->dev = NULL;
-       drm_modeset_unlock_all(drm_dev);
+       DRM_MODESET_LOCK_ALL_END(drm_dev, ctx, ret);
 }
 
 static const struct component_ops nv50_audio_component_bind_ops = {