From: Sean Paul <sean@poorly.run>
To: Fernando Ramos <greenfoo@u92.eu>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
sean@poorly.run, linux-doc@vger.kernel.org,
amd-gfx@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org,
nouveau@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org,
linux-tegra@vger.kernel.org
Subject: Re: [Nouveau] [PATCH 06/15] drm/tegra: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()
Date: Fri, 17 Sep 2021 11:38:05 -0400 [thread overview]
Message-ID: <20210917153805.GF2515@art_vandelay> (raw)
In-Reply-To: <20210916211552.33490-7-greenfoo@u92.eu>
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
next prev parent reply other threads:[~2021-09-17 15:38 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-16 21:15 [Nouveau] [PATCH 00/15] drm: cleanup: Use DRM_MODESET_LOCK_ALL_* helpers where possible Fernando Ramos
2021-09-16 21:15 ` [Nouveau] [PATCH 01/15] dmr: cleanup: drm_modeset_lock_all_ctx() --> DRM_MODESET_LOCK_ALL_BEGIN() Fernando Ramos
2021-09-17 15:28 ` Sean Paul
2021-09-17 22:07 ` Fernando Ramos
2021-09-16 21:15 ` [Nouveau] [PATCH 02/15] dmr/i915: " Fernando Ramos
2021-09-17 15:31 ` Sean Paul
2021-09-16 21:15 ` [Nouveau] [PATCH 03/15] dmr/msm: " Fernando Ramos
2021-09-17 15:29 ` Sean Paul
2021-09-20 1:54 ` kernel test robot
2021-09-20 21:25 ` Fernando Ramos
2021-09-16 21:15 ` [Nouveau] [PATCH 04/15] drm: cleanup: drm_modeset_lock_all() " Fernando Ramos
2021-09-17 15:35 ` Sean Paul
2021-09-16 21:15 ` [Nouveau] [PATCH 05/15] drm/vmwgfx: " Fernando Ramos
2021-09-17 15:37 ` Sean Paul
2021-09-16 21:15 ` [Nouveau] [PATCH 06/15] drm/tegra: " Fernando Ramos
2021-09-17 15:38 ` Sean Paul [this message]
2021-09-17 22:34 ` Fernando Ramos
2021-09-16 21:15 ` [Nouveau] [PATCH 07/15] drm/shmobile: " Fernando Ramos
2021-09-17 15:38 ` Sean Paul
2021-09-16 21:15 ` [Nouveau] [PATCH 08/15] drm/radeon: " Fernando Ramos
2021-09-17 15:40 ` Sean Paul
2021-09-17 22:32 ` Fernando Ramos
2021-09-16 21:15 ` [Nouveau] [PATCH 09/15] drm/omapdrm: " Fernando Ramos
2021-09-17 15:40 ` Sean Paul
2021-09-17 15:41 ` Sean Paul
2021-09-17 22:37 ` Fernando Ramos
2021-09-16 21:15 ` [Nouveau] [PATCH 10/15] drm/nouveau: " Fernando Ramos
2021-09-17 15:42 ` Sean Paul
2021-09-16 21:15 ` [Nouveau] [PATCH 11/15] drm/msm: " Fernando Ramos
2021-09-17 15:42 ` Sean Paul
2021-09-17 22:41 ` Fernando Ramos
2021-09-16 21:15 ` [Nouveau] [PATCH 12/15] drm/i915: " Fernando Ramos
2021-09-17 15:48 ` Sean Paul
2021-09-17 22:57 ` Fernando Ramos
2021-09-16 21:15 ` [Nouveau] [PATCH 13/15] drm/gma500: " Fernando Ramos
2021-09-17 15:49 ` Sean Paul
2021-09-16 21:15 ` [Nouveau] [PATCH 14/15] drm/amd: " Fernando Ramos
2021-09-17 15:55 ` Sean Paul
2021-09-17 23:17 ` Fernando Ramos
2021-09-18 9:42 ` Fernando Ramos
2021-09-16 21:15 ` [Nouveau] [PATCH 15/15] doc: drm: remove TODO entry regarding DRM_MODSET_LOCK_ALL cleanup Fernando Ramos
2021-09-17 15:56 ` Sean Paul
2021-09-17 23:21 ` Fernando Ramos
2021-09-17 15:24 ` [Nouveau] [PATCH 00/15] drm: cleanup: Use DRM_MODESET_LOCK_ALL_* helpers where possible Daniel Vetter
2021-09-17 21:41 ` Fernando Ramos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210917153805.GF2515@art_vandelay \
--to=sean@poorly.run \
--cc=amd-gfx@lists.freedesktop.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=greenfoo@u92.eu \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=nouveau@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).