All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: "Daniel Vetter" <daniel.vetter@ffwll.ch>,
	dri-devel@lists.freedesktop.org,
	"Thomas Hellström" <thomas.hellstrom@linux.intel.com>
Subject: [Intel-gfx] [PATCH 2/2] drm/i915: prefer dma_fence_might_wait in wait_migration
Date: Tue,  6 Jul 2021 10:05:59 +0100	[thread overview]
Message-ID: <20210706090559.1589544-2-matthew.auld@intel.com> (raw)
In-Reply-To: <20210706090559.1589544-1-matthew.auld@intel.com>

dma_fence_might_wait is more interesting here, since it also teaches
lockdep about the fence critical section and wait_migration dependency.

Suggested-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_wait.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_wait.c b/drivers/gpu/drm/i915/gem/i915_gem_wait.c
index f909aaa09d9c..190e221eaf81 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_wait.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_wait.c
@@ -305,7 +305,7 @@ i915_gem_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
 int i915_gem_object_wait_migration(struct drm_i915_gem_object *obj,
 				   unsigned int flags)
 {
-	might_sleep();
+	dma_fence_might_wait();
 	/* NOP for now. */
 	return 0;
 }
-- 
2.26.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

WARNING: multiple messages have this Message-ID (diff)
From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: "Daniel Vetter" <daniel.vetter@ffwll.ch>,
	dri-devel@lists.freedesktop.org,
	"Thomas Hellström" <thomas.hellstrom@linux.intel.com>
Subject: [PATCH 2/2] drm/i915: prefer dma_fence_might_wait in wait_migration
Date: Tue,  6 Jul 2021 10:05:59 +0100	[thread overview]
Message-ID: <20210706090559.1589544-2-matthew.auld@intel.com> (raw)
In-Reply-To: <20210706090559.1589544-1-matthew.auld@intel.com>

dma_fence_might_wait is more interesting here, since it also teaches
lockdep about the fence critical section and wait_migration dependency.

Suggested-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_wait.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_wait.c b/drivers/gpu/drm/i915/gem/i915_gem_wait.c
index f909aaa09d9c..190e221eaf81 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_wait.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_wait.c
@@ -305,7 +305,7 @@ i915_gem_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file)
 int i915_gem_object_wait_migration(struct drm_i915_gem_object *obj,
 				   unsigned int flags)
 {
-	might_sleep();
+	dma_fence_might_wait();
 	/* NOP for now. */
 	return 0;
 }
-- 
2.26.3


  reply	other threads:[~2021-07-06  9:07 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-06  9:05 [Intel-gfx] [PATCH 1/2] dma-fence: export dma_fence_might_wait Matthew Auld
2021-07-06  9:05 ` Matthew Auld
2021-07-06  9:05 ` Matthew Auld [this message]
2021-07-06  9:05   ` [PATCH 2/2] drm/i915: prefer dma_fence_might_wait in wait_migration Matthew Auld
2021-07-06  9:14   ` [Intel-gfx] " Daniel Vetter
2021-07-06  9:14     ` Daniel Vetter
2021-07-06  9:14 ` [Intel-gfx] [PATCH 1/2] dma-fence: export dma_fence_might_wait Daniel Vetter
2021-07-06  9:14   ` Daniel Vetter
2021-07-06  9:15   ` [Intel-gfx] " Daniel Vetter
2021-07-06  9:15     ` Daniel Vetter
2021-07-06  9:34 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/2] " Patchwork
2021-07-06 10:03 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2021-07-06 14:11 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/2] dma-fence: export dma_fence_might_wait (rev2) Patchwork
2021-07-06 14:39 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-07-06 15:56 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork

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=20210706090559.1589544-2-matthew.auld@intel.com \
    --to=matthew.auld@intel.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=thomas.hellstrom@linux.intel.com \
    /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.