From: Fernando Ramos <greenfoo@u92.eu>
To: dri-devel@lists.freedesktop.org
Cc: 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: [Nouveau] [PATCH v3 11/20] drm/msm: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()
Date: Thu, 7 Oct 2021 21:37:46 +0200 [thread overview]
Message-ID: <20211007193755.29579-12-greenfoo@u92.eu> (raw)
In-Reply-To: <20211007193755.29579-1-greenfoo@u92.eu>
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/msm/disp/dpu1/dpu_crtc.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 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..b89687074890 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -18,6 +18,7 @@
#include <drm/drm_probe_helper.h>
#include <drm/drm_rect.h>
#include <drm/drm_vblank.h>
+#include <drm/drm_drv.h>
#include "dpu_kms.h"
#include "dpu_hw_lm.h"
@@ -1172,14 +1173,15 @@ 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 i, out_width, 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,9 +1265,9 @@ 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;
}
DEFINE_SHOW_ATTRIBUTE(_dpu_debugfs_status);
--
2.33.0
next prev parent reply other threads:[~2021-10-18 17:19 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-07 19:37 [Nouveau] [PATCH v3 00/20] drm: cleanup: Use DRM_MODESET_LOCK_ALL_* helpers Fernando Ramos
2021-10-07 19:37 ` [Nouveau] [PATCH v3 01/20] drm: cleanup: drm_modeset_lock_all_ctx() --> DRM_MODESET_LOCK_ALL_BEGIN() Fernando Ramos
2021-10-07 19:37 ` [Nouveau] [PATCH v3 02/20] drm/i915: " Fernando Ramos
2021-10-07 19:37 ` [Nouveau] [PATCH v3 03/20] drm/msm: " Fernando Ramos
2021-10-07 19:37 ` [Nouveau] [PATCH v3 04/20] drm: cleanup: drm_modeset_lock_all() " Fernando Ramos
2021-10-07 19:37 ` [Nouveau] [PATCH v3 05/20] drm/vmwgfx: " Fernando Ramos
2021-10-07 19:37 ` [Nouveau] [PATCH v3 06/20] drm/tegra: " Fernando Ramos
2021-10-07 19:37 ` [Nouveau] [PATCH v3 07/20] drm/shmobile: " Fernando Ramos
2021-10-07 19:37 ` [Nouveau] [PATCH v3 08/20] drm/radeon: " Fernando Ramos
2021-10-07 19:37 ` [Nouveau] [PATCH v3 09/20] drm/omapdrm: " Fernando Ramos
2021-10-07 19:37 ` [Nouveau] [PATCH v3 10/20] drm/nouveau: " Fernando Ramos
2021-10-07 19:37 ` Fernando Ramos [this message]
2021-10-07 19:37 ` [Nouveau] [PATCH v3 12/20] drm/i915: " Fernando Ramos
2021-10-07 19:37 ` [Nouveau] [PATCH v3 13/20] drm/i915: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN() [part 2] Fernando Ramos
2021-10-07 19:37 ` [Nouveau] [PATCH v3 14/20] drm/i915: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN() [part 3] Fernando Ramos
2021-10-07 19:37 ` [Nouveau] [PATCH v3 15/20] drm/gma500: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN() Fernando Ramos
2021-10-07 19:37 ` [Nouveau] [PATCH v3 16/20] drm/amd: " Fernando Ramos
2021-10-07 19:37 ` [Nouveau] [PATCH v3 17/20] drm/amd: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN() [part 2] Fernando Ramos
2021-10-07 19:37 ` [Nouveau] [PATCH v3 18/20] drm/amd: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN() [part 3] Fernando Ramos
2021-10-07 19:37 ` [Nouveau] [PATCH v3 19/20] drm: cleanup: remove drm_modeset_(un)lock_all() Fernando Ramos
2021-10-07 19:37 ` [Nouveau] [PATCH v3 20/20] drm: cleanup: remove acquire_ctx from drm_mode_config Fernando Ramos
2021-10-08 20:55 ` 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=20211007193755.29579-12-greenfoo@u92.eu \
--to=greenfoo@u92.eu \
--cc=amd-gfx@lists.freedesktop.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--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 \
--cc=sean@poorly.run \
/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).