2021-09-17 06:57:17

by Fernando Ramos

Subject: [PATCH 11/15] drm/msm: 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 <[email protected]>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index 768012243b44..4cbc79eaee17 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -1172,14 +1172,16 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data)
struct drm_display_mode *mode;
struct drm_framebuffer *fb;
struct drm_plane_state *state;
+ struct drm_modeset_acquire_ctx ctx;
struct dpu_crtc_state *cstate;

int i, out_width;
+ int ret;

dpu_crtc = s->private;
crtc = &dpu_crtc->base;

- drm_modeset_lock_all(crtc->dev);
+ DRM_MODESET_LOCK_ALL_BEGIN(crtc->dev, ctx, 0, ret);
cstate = to_dpu_crtc_state(crtc->state);

mode = &crtc->state->adjusted_mode;
@@ -1263,7 +1265,7 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data)
dpu_crtc->vblank_cb_time = ktime_set(0, 0);
}

- drm_modeset_unlock_all(crtc->dev);
+ DRM_MODESET_LOCK_ALL_END(crtc->dev, ctx, ret);

return 0;
}
--
2.33.0

2021-09-17 15:48:59

by Sean Paul

Subject: Re: [PATCH 11/15] drm/msm: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()

On Thu, Sep 16, 2021 at 11:15:48PM +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 <[email protected]>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> index 768012243b44..4cbc79eaee17 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> @@ -1172,14 +1172,16 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data)
> struct drm_display_mode *mode;
> struct drm_framebuffer *fb;
> struct drm_plane_state *state;
> + struct drm_modeset_acquire_ctx ctx;
> struct dpu_crtc_state *cstate;
>
> int i, out_width;
> + int ret;

Please put ret with i & out_width

>
> dpu_crtc = s->private;
> crtc = &dpu_crtc->base;
>
> - drm_modeset_lock_all(crtc->dev);
> + DRM_MODESET_LOCK_ALL_BEGIN(crtc->dev, ctx, 0, ret);
> cstate = to_dpu_crtc_state(crtc->state);
>
> mode = &crtc->state->adjusted_mode;
> @@ -1263,7 +1265,7 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data)
> dpu_crtc->vblank_cb_time = ktime_set(0, 0);
> }
>
> - drm_modeset_unlock_all(crtc->dev);
> + DRM_MODESET_LOCK_ALL_END(crtc->dev, ctx, ret);
>
> return 0;

Return ret here

> }
> --
> 2.33.0
>

--
Sean Paul, Software Engineer, Google / Chromium OS

2021-09-18 05:10:18

by Fernando Ramos

Subject: Re: [PATCH 11/15] drm/msm: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()

> > int i, out_width;
> > + int ret;
>
> Please put ret with i & out_width

Done!


> > - drm_modeset_unlock_all(crtc->dev);
> > + DRM_MODESET_LOCK_ALL_END(crtc->dev, ctx, ret);
> >
> > return 0;
>
> Return ret here

Done!