| Message ID | 20210916211552.33490-7-greenfoo@u92.eu |
|---|---|
| State | Accepted |
| Commit | a2cd9947d99b54c959fce20dc19d81af53f4674e |
| Headers | show |
| Series | drm: cleanup: Use DRM_MODESET_LOCK_ALL_* helpers where possible | expand |
On Thu, Sep 16, 2021 at 11:15:43PM +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/tegra/dsi.c | 6 ++++-- > drivers/gpu/drm/tegra/hdmi.c | 5 +++-- > drivers/gpu/drm/tegra/sor.c | 10 ++++++---- > 3 files changed, 13 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c > index f46d377f0c30..77a496f6a2e9 100644 > --- a/drivers/gpu/drm/tegra/dsi.c > +++ b/drivers/gpu/drm/tegra/dsi.c > @@ -202,10 +202,12 @@ 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; > + int ret; You can use err here instead. With that fixed, Reviewed-by: Sean Paul <sean@poorly.run> > > - drm_modeset_lock_all(drm); > + DRM_MODESET_LOCK_ALL_BEGIN(drm, ctx, 0, ret); > > 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, ret); > return err; > } > > diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c > index e5d2a4026028..669a2ebb55ae 100644 > --- a/drivers/gpu/drm/tegra/hdmi.c > +++ b/drivers/gpu/drm/tegra/hdmi.c > @@ -1031,10 +1031,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 +1050,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 0ea320c1092b..323d95eb0cac 100644 > --- a/drivers/gpu/drm/tegra/sor.c > +++ b/drivers/gpu/drm/tegra/sor.c > @@ -1490,10 +1490,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 +1523,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 +1653,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 +1672,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; > } > > -- > 2.33.0 > -- Sean Paul, Software Engineer, Google / Chromium OS
> > int err = 0; > > + int ret; > > You can use err here instead. Done!
diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c index f46d377f0c30..77a496f6a2e9 100644 --- a/drivers/gpu/drm/tegra/dsi.c +++ b/drivers/gpu/drm/tegra/dsi.c @@ -202,10 +202,12 @@ 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; + int ret; - drm_modeset_lock_all(drm); + DRM_MODESET_LOCK_ALL_BEGIN(drm, ctx, 0, ret); 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, ret); return err; } diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c index e5d2a4026028..669a2ebb55ae 100644 --- a/drivers/gpu/drm/tegra/hdmi.c +++ b/drivers/gpu/drm/tegra/hdmi.c @@ -1031,10 +1031,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 +1050,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 0ea320c1092b..323d95eb0cac 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -1490,10 +1490,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 +1523,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 +1653,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 +1672,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; }
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/tegra/dsi.c | 6 ++++-- drivers/gpu/drm/tegra/hdmi.c | 5 +++-- drivers/gpu/drm/tegra/sor.c | 10 ++++++---- 3 files changed, 13 insertions(+), 8 deletions(-)