diff mbox series

[10/15] drm/nouveau: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()

Message ID 20210916211552.33490-11-greenfoo@u92.eu
State Accepted
Commit 6aa2daae589b63e8b39fe6f7f2b59fb3063efa05
Headers show
Series drm: cleanup: Use DRM_MODESET_LOCK_ALL_* helpers where possible | expand

Commit Message

Fernando Ramos Sept. 16, 2021, 9:15 p.m. UTC
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>
---
 drivers/gpu/drm/nouveau/dispnv50/disp.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Comments

Sean Paul Sept. 17, 2021, 3:42 p.m. UTC | #1
On Thu, Sep 16, 2021 at 11:15:47PM +0200, Fernando Ramos wrote:
> 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>

> ---

>  drivers/gpu/drm/nouveau/dispnv50/disp.c | 12 ++++++++----

>  1 file changed, 8 insertions(+), 4 deletions(-)

> 

> diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c

> index d7b9f7f8c9e3..eb613af4cdd5 100644

> --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c

> +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c

> @@ -667,15 +667,17 @@ 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);

> +	DRM_MODESET_LOCK_ALL_END(drm_dev, ctx, ret);

>  	return 0;


Return ret here, with that fixed,

Reviewed-by: Sean Paul <sean@poorly.run>



>  }

>  

> @@ -686,12 +688,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 = {

> -- 

> 2.33.0

> 


-- 
Sean Paul, Software Engineer, Google / Chromium OS
diff mbox series

Patch

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index d7b9f7f8c9e3..eb613af4cdd5 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -667,15 +667,17 @@  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);
+	DRM_MODESET_LOCK_ALL_END(drm_dev, ctx, ret);
 	return 0;
 }
 
@@ -686,12 +688,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 = {