All of lore.kernel.org
 help / color / mirror / Atom feed
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: [PATCH v3 16/20] drm/amd: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()
Date: Thu,  7 Oct 2021 21:37:51 +0200	[thread overview]
Message-ID: <20211007193755.29579-17-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/amd/amdgpu/amdgpu_display.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index dc50c05f23fc..0ea7bdbc8482 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -40,6 +40,7 @@
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_fourcc.h>
 #include <drm/drm_vblank.h>
+#include <drm/drm_drv.h>
 
 static void amdgpu_display_flip_callback(struct dma_fence *f,
 					 struct dma_fence_cb *cb)
@@ -1574,16 +1575,21 @@ int amdgpu_display_suspend_helper(struct amdgpu_device *adev)
 	struct drm_crtc *crtc;
 	struct drm_connector *connector;
 	struct drm_connector_list_iter iter;
-	int r;
+	struct drm_modeset_acquire_ctx ctx;
+	int r, ret;
 
 	/* turn off display hw */
-	drm_modeset_lock_all(dev);
+	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
 	drm_connector_list_iter_begin(dev, &iter);
 	drm_for_each_connector_iter(connector, &iter)
 		drm_helper_connector_dpms(connector,
 					  DRM_MODE_DPMS_OFF);
 	drm_connector_list_iter_end(&iter);
-	drm_modeset_unlock_all(dev);
+	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
+
+	if (ret)
+		return ret;
+
 	/* unpin the front buffers and cursors */
 	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
 		struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
@@ -1621,7 +1627,8 @@ int amdgpu_display_resume_helper(struct amdgpu_device *adev)
 	struct drm_connector *connector;
 	struct drm_connector_list_iter iter;
 	struct drm_crtc *crtc;
-	int r;
+	struct drm_modeset_acquire_ctx ctx;
+	int r, ret;
 
 	/* pin cursors */
 	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
@@ -1643,7 +1650,7 @@ int amdgpu_display_resume_helper(struct amdgpu_device *adev)
 	drm_helper_resume_force_mode(dev);
 
 	/* turn on display hw */
-	drm_modeset_lock_all(dev);
+	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
 
 	drm_connector_list_iter_begin(dev, &iter);
 	drm_for_each_connector_iter(connector, &iter)
@@ -1651,8 +1658,8 @@ int amdgpu_display_resume_helper(struct amdgpu_device *adev)
 					  DRM_MODE_DPMS_ON);
 	drm_connector_list_iter_end(&iter);
 
-	drm_modeset_unlock_all(dev);
+	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
 
-	return 0;
+	return ret;
 }
 
-- 
2.33.0


WARNING: multiple messages have this Message-ID (diff)
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: [Intel-gfx] [PATCH v3 16/20] drm/amd: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()
Date: Thu,  7 Oct 2021 21:37:51 +0200	[thread overview]
Message-ID: <20211007193755.29579-17-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/amd/amdgpu/amdgpu_display.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index dc50c05f23fc..0ea7bdbc8482 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -40,6 +40,7 @@
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_fourcc.h>
 #include <drm/drm_vblank.h>
+#include <drm/drm_drv.h>
 
 static void amdgpu_display_flip_callback(struct dma_fence *f,
 					 struct dma_fence_cb *cb)
@@ -1574,16 +1575,21 @@ int amdgpu_display_suspend_helper(struct amdgpu_device *adev)
 	struct drm_crtc *crtc;
 	struct drm_connector *connector;
 	struct drm_connector_list_iter iter;
-	int r;
+	struct drm_modeset_acquire_ctx ctx;
+	int r, ret;
 
 	/* turn off display hw */
-	drm_modeset_lock_all(dev);
+	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
 	drm_connector_list_iter_begin(dev, &iter);
 	drm_for_each_connector_iter(connector, &iter)
 		drm_helper_connector_dpms(connector,
 					  DRM_MODE_DPMS_OFF);
 	drm_connector_list_iter_end(&iter);
-	drm_modeset_unlock_all(dev);
+	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
+
+	if (ret)
+		return ret;
+
 	/* unpin the front buffers and cursors */
 	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
 		struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
@@ -1621,7 +1627,8 @@ int amdgpu_display_resume_helper(struct amdgpu_device *adev)
 	struct drm_connector *connector;
 	struct drm_connector_list_iter iter;
 	struct drm_crtc *crtc;
-	int r;
+	struct drm_modeset_acquire_ctx ctx;
+	int r, ret;
 
 	/* pin cursors */
 	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
@@ -1643,7 +1650,7 @@ int amdgpu_display_resume_helper(struct amdgpu_device *adev)
 	drm_helper_resume_force_mode(dev);
 
 	/* turn on display hw */
-	drm_modeset_lock_all(dev);
+	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
 
 	drm_connector_list_iter_begin(dev, &iter);
 	drm_for_each_connector_iter(connector, &iter)
@@ -1651,8 +1658,8 @@ int amdgpu_display_resume_helper(struct amdgpu_device *adev)
 					  DRM_MODE_DPMS_ON);
 	drm_connector_list_iter_end(&iter);
 
-	drm_modeset_unlock_all(dev);
+	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
 
-	return 0;
+	return ret;
 }
 
-- 
2.33.0


WARNING: multiple messages have this Message-ID (diff)
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 16/20] drm/amd: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN()
Date: Thu,  7 Oct 2021 21:37:51 +0200	[thread overview]
Message-ID: <20211007193755.29579-17-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/amd/amdgpu/amdgpu_display.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index dc50c05f23fc..0ea7bdbc8482 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -40,6 +40,7 @@
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_fourcc.h>
 #include <drm/drm_vblank.h>
+#include <drm/drm_drv.h>
 
 static void amdgpu_display_flip_callback(struct dma_fence *f,
 					 struct dma_fence_cb *cb)
@@ -1574,16 +1575,21 @@ int amdgpu_display_suspend_helper(struct amdgpu_device *adev)
 	struct drm_crtc *crtc;
 	struct drm_connector *connector;
 	struct drm_connector_list_iter iter;
-	int r;
+	struct drm_modeset_acquire_ctx ctx;
+	int r, ret;
 
 	/* turn off display hw */
-	drm_modeset_lock_all(dev);
+	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
 	drm_connector_list_iter_begin(dev, &iter);
 	drm_for_each_connector_iter(connector, &iter)
 		drm_helper_connector_dpms(connector,
 					  DRM_MODE_DPMS_OFF);
 	drm_connector_list_iter_end(&iter);
-	drm_modeset_unlock_all(dev);
+	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
+
+	if (ret)
+		return ret;
+
 	/* unpin the front buffers and cursors */
 	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
 		struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
@@ -1621,7 +1627,8 @@ int amdgpu_display_resume_helper(struct amdgpu_device *adev)
 	struct drm_connector *connector;
 	struct drm_connector_list_iter iter;
 	struct drm_crtc *crtc;
-	int r;
+	struct drm_modeset_acquire_ctx ctx;
+	int r, ret;
 
 	/* pin cursors */
 	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
@@ -1643,7 +1650,7 @@ int amdgpu_display_resume_helper(struct amdgpu_device *adev)
 	drm_helper_resume_force_mode(dev);
 
 	/* turn on display hw */
-	drm_modeset_lock_all(dev);
+	DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret);
 
 	drm_connector_list_iter_begin(dev, &iter);
 	drm_for_each_connector_iter(connector, &iter)
@@ -1651,8 +1658,8 @@ int amdgpu_display_resume_helper(struct amdgpu_device *adev)
 					  DRM_MODE_DPMS_ON);
 	drm_connector_list_iter_end(&iter);
 
-	drm_modeset_unlock_all(dev);
+	DRM_MODESET_LOCK_ALL_END(dev, ctx, ret);
 
-	return 0;
+	return ret;
 }
 
-- 
2.33.0


  parent reply	other threads:[~2021-10-07 19:39 UTC|newest]

Thread overview: 73+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-07 19:37 [PATCH v3 00/20] drm: cleanup: Use DRM_MODESET_LOCK_ALL_* helpers Fernando Ramos
2021-10-07 19:37 ` [Nouveau] " Fernando Ramos
2021-10-07 19:37 ` [Intel-gfx] " Fernando Ramos
2021-10-07 19:37 ` [PATCH v3 01/20] drm: cleanup: drm_modeset_lock_all_ctx() --> DRM_MODESET_LOCK_ALL_BEGIN() Fernando Ramos
2021-10-07 19:37   ` [Nouveau] " Fernando Ramos
2021-10-07 19:37   ` [Intel-gfx] " Fernando Ramos
2021-10-07 19:37 ` [PATCH v3 02/20] drm/i915: " Fernando Ramos
2021-10-07 19:37   ` [Nouveau] " Fernando Ramos
2021-10-07 19:37   ` [Intel-gfx] " Fernando Ramos
2021-10-07 19:37 ` [PATCH v3 03/20] drm/msm: " Fernando Ramos
2021-10-07 19:37   ` [Nouveau] " Fernando Ramos
2021-10-07 19:37   ` [Intel-gfx] " Fernando Ramos
2021-10-07 19:37 ` [PATCH v3 04/20] drm: cleanup: drm_modeset_lock_all() " Fernando Ramos
2021-10-07 19:37   ` [Nouveau] " Fernando Ramos
2021-10-07 19:37   ` [Intel-gfx] " Fernando Ramos
2021-10-07 19:37 ` [PATCH v3 05/20] drm/vmwgfx: " Fernando Ramos
2021-10-07 19:37   ` [Nouveau] " Fernando Ramos
2021-10-07 19:37   ` [Intel-gfx] " Fernando Ramos
2021-10-07 19:37 ` [PATCH v3 06/20] drm/tegra: " Fernando Ramos
2021-10-07 19:37   ` [Nouveau] " Fernando Ramos
2021-10-07 19:37   ` [Intel-gfx] " Fernando Ramos
2021-10-07 19:37 ` [PATCH v3 07/20] drm/shmobile: " Fernando Ramos
2021-10-07 19:37   ` [Nouveau] " Fernando Ramos
2021-10-07 19:37   ` [Intel-gfx] " Fernando Ramos
2021-10-07 19:37 ` [PATCH v3 08/20] drm/radeon: " Fernando Ramos
2021-10-07 19:37   ` [Nouveau] " Fernando Ramos
2021-10-07 19:37   ` [Intel-gfx] " Fernando Ramos
2021-10-07 19:37 ` [PATCH v3 09/20] drm/omapdrm: " Fernando Ramos
2021-10-07 19:37   ` [Nouveau] " Fernando Ramos
2021-10-07 19:37   ` [Intel-gfx] " Fernando Ramos
2021-10-07 19:37 ` [PATCH v3 10/20] drm/nouveau: " Fernando Ramos
2021-10-07 19:37   ` [Nouveau] " Fernando Ramos
2021-10-07 19:37   ` [Intel-gfx] " Fernando Ramos
2021-10-07 19:37 ` [PATCH v3 11/20] drm/msm: " Fernando Ramos
2021-10-07 19:37   ` [Nouveau] " Fernando Ramos
2021-10-07 19:37   ` [Intel-gfx] " Fernando Ramos
2021-10-07 19:37 ` [PATCH v3 12/20] drm/i915: " Fernando Ramos
2021-10-07 19:37   ` [Nouveau] " Fernando Ramos
2021-10-07 19:37   ` [Intel-gfx] " Fernando Ramos
2021-10-07 19:37 ` [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] " Fernando Ramos
2021-10-07 19:37   ` [Intel-gfx] " Fernando Ramos
2021-10-07 19:37 ` [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] " Fernando Ramos
2021-10-07 19:37   ` [Intel-gfx] " Fernando Ramos
2021-10-07 19:37 ` [PATCH v3 15/20] drm/gma500: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN() Fernando Ramos
2021-10-07 19:37   ` [Nouveau] " Fernando Ramos
2021-10-07 19:37   ` [Intel-gfx] " Fernando Ramos
2021-10-07 19:37 ` Fernando Ramos [this message]
2021-10-07 19:37   ` [Nouveau] [PATCH v3 16/20] drm/amd: " Fernando Ramos
2021-10-07 19:37   ` [Intel-gfx] " Fernando Ramos
2021-10-07 19:37 ` [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] " Fernando Ramos
2021-10-07 19:37   ` [Intel-gfx] " Fernando Ramos
2021-10-07 19:37 ` [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] " Fernando Ramos
2021-10-07 19:37   ` [Intel-gfx] " Fernando Ramos
2021-10-07 19:37 ` [PATCH v3 19/20] drm: cleanup: remove drm_modeset_(un)lock_all() Fernando Ramos
2021-10-07 19:37   ` [Nouveau] " Fernando Ramos
2021-10-07 19:37   ` [Intel-gfx] " Fernando Ramos
2021-10-07 19:37 ` [PATCH v3 20/20] drm: cleanup: remove acquire_ctx from drm_mode_config Fernando Ramos
2021-10-07 19:37   ` [Nouveau] " Fernando Ramos
2021-10-07 19:37   ` [Intel-gfx] " Fernando Ramos
2021-10-08 20:55   ` Fernando Ramos
2021-10-08 20:55     ` [Nouveau] " Fernando Ramos
2021-10-08 20:55     ` [Intel-gfx] " Fernando Ramos
2021-10-07 20:58 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm: cleanup: Use DRM_MODESET_LOCK_ALL_* helpers Patchwork
2021-10-08 21:40   ` Fernando Ramos
2021-10-07 21:01 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-10-08 21:38   ` Fernando Ramos
2021-10-07 21:31 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-10-07 23:58 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-10-08 21:42   ` 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-17-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.