All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>,
	Jani Nikula <jani.nikula@intel.com>,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
	Matthew Auld <matthew.auld@intel.com>,
	Daniel Vetter <daniel.vetter@intel.com>
Subject: [PATCH 2/4] drm/i915: Use dma_resv locking wrappers
Date: Mon, 25 Nov 2019 10:43:54 +0100	[thread overview]
Message-ID: <20191125094356.161941-3-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20191125094356.161941-1-daniel.vetter@ffwll.ch>

I'll add more fancy logic to them soon, so everyone really has to use
them. Plus they already provide some nice additional debug
infrastructure on top of direct ww_mutex usage for the fences tracked
by dma_resv.

Aside: We might want to create wrappers for i915_vma locking of the
->resv like we have for the i915_gem_bo itself already.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index 7a87e8270460..7b8f4ebd9986 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -1848,7 +1848,7 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb)
 	for (i = 0; i < count; i++) {
 		struct i915_vma *vma = eb->vma[i];
 
-		err = ww_mutex_lock_interruptible(&vma->resv->lock, &acquire);
+		err = dma_resv_lock_interruptible(vma->resv, &acquire);
 		if (!err)
 			continue;
 
@@ -1859,7 +1859,7 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb)
 			do {
 				int j = i - 1;
 
-				ww_mutex_unlock(&eb->vma[j]->resv->lock);
+				dma_resv_unlock(eb->vma[j]->resv);
 
 				swap(eb->flags[i], eb->flags[j]);
 				swap(eb->vma[i],  eb->vma[j]);
@@ -1868,7 +1868,7 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb)
 			GEM_BUG_ON(vma != eb->vma[0]);
 			vma->exec_flags = &eb->flags[0];
 
-			err = ww_mutex_lock_slow_interruptible(&vma->resv->lock,
+			err = dma_resv_lock_slow_interruptible(vma->resv,
 							       &acquire);
 		}
 		if (err)
-- 
2.24.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Jani Nikula <jani.nikula@intel.com>,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
	Matthew Auld <matthew.auld@intel.com>,
	Daniel Vetter <daniel.vetter@intel.com>
Subject: [Intel-gfx] [PATCH 2/4] drm/i915: Use dma_resv locking wrappers
Date: Mon, 25 Nov 2019 10:43:54 +0100	[thread overview]
Message-ID: <20191125094356.161941-3-daniel.vetter@ffwll.ch> (raw)
Message-ID: <20191125094354.8XBX8IB59oJYRjUpqbSAEWGp6DAIEmrIsN32wrrV99s@z> (raw)
In-Reply-To: <20191125094356.161941-1-daniel.vetter@ffwll.ch>

I'll add more fancy logic to them soon, so everyone really has to use
them. Plus they already provide some nice additional debug
infrastructure on top of direct ww_mutex usage for the fences tracked
by dma_resv.

Aside: We might want to create wrappers for i915_vma locking of the
->resv like we have for the i915_gem_bo itself already.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index 7a87e8270460..7b8f4ebd9986 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -1848,7 +1848,7 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb)
 	for (i = 0; i < count; i++) {
 		struct i915_vma *vma = eb->vma[i];
 
-		err = ww_mutex_lock_interruptible(&vma->resv->lock, &acquire);
+		err = dma_resv_lock_interruptible(vma->resv, &acquire);
 		if (!err)
 			continue;
 
@@ -1859,7 +1859,7 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb)
 			do {
 				int j = i - 1;
 
-				ww_mutex_unlock(&eb->vma[j]->resv->lock);
+				dma_resv_unlock(eb->vma[j]->resv);
 
 				swap(eb->flags[i], eb->flags[j]);
 				swap(eb->vma[i],  eb->vma[j]);
@@ -1868,7 +1868,7 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb)
 			GEM_BUG_ON(vma != eb->vma[0]);
 			vma->exec_flags = &eb->flags[0];
 
-			err = ww_mutex_lock_slow_interruptible(&vma->resv->lock,
+			err = dma_resv_lock_slow_interruptible(vma->resv,
 							       &acquire);
 		}
 		if (err)
-- 
2.24.0

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

  parent reply	other threads:[~2019-11-25  9:44 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-25  9:43 [PATCH 0/4] consistently use dma_resv locking wrappers Daniel Vetter
2019-11-25  9:43 ` [Intel-gfx] " Daniel Vetter
2019-11-25  9:43 ` Daniel Vetter
2019-11-25  9:43 ` [PATCH 1/4] drm/etnaviv: Use " Daniel Vetter
2019-11-25  9:43   ` [Intel-gfx] " Daniel Vetter
2019-12-13 20:08   ` Daniel Vetter
2019-12-13 20:08     ` [Intel-gfx] " Daniel Vetter
2019-12-13 20:52     ` Ruhl, Michael J
2019-12-13 20:52       ` [Intel-gfx] " Ruhl, Michael J
2019-12-14  0:09   ` [PATCH] " Daniel Vetter
2019-12-16 14:29     ` Ruhl, Michael J
2019-12-16 15:14     ` Lucas Stach
2019-12-17 13:03       ` Daniel Vetter
2019-11-25  9:43 ` Daniel Vetter [this message]
2019-11-25  9:43   ` [Intel-gfx] [PATCH 2/4] drm/i915: " Daniel Vetter
2019-12-14  0:10   ` Daniel Vetter
2019-12-14  0:10     ` [Intel-gfx] " Daniel Vetter
2019-11-25  9:43 ` [PATCH 3/4] drm/msm: " Daniel Vetter
2019-11-25  9:43   ` [Intel-gfx] " Daniel Vetter
2019-11-25  9:43   ` Daniel Vetter
2019-11-25  9:43   ` Daniel Vetter
2019-12-13 20:08   ` Daniel Vetter
2019-12-13 20:08     ` [Intel-gfx] " Daniel Vetter
2019-12-13 20:08     ` Daniel Vetter
2019-12-13 21:43     ` Eric Anholt
2019-12-13 21:43       ` [Intel-gfx] " Eric Anholt
2019-12-13 21:43       ` Eric Anholt
2019-11-25  9:43 ` [PATCH 4/4] drm/vc4: " Daniel Vetter
2019-11-25  9:43   ` [Intel-gfx] " Daniel Vetter
2019-11-25  9:43   ` Daniel Vetter
2019-12-13 20:10   ` Daniel Vetter
2019-12-13 20:10     ` [Intel-gfx] " Daniel Vetter
2019-12-13 21:40     ` Eric Anholt
2019-12-13 21:40       ` [Intel-gfx] " Eric Anholt
2019-11-25 11:55 ` ✗ Fi.CI.CHECKPATCH: warning for consistently use " Patchwork
2019-11-25 11:55   ` [Intel-gfx] " Patchwork
2019-11-25 12:20 ` ✓ Fi.CI.BAT: success " Patchwork
2019-11-25 12:20   ` [Intel-gfx] " Patchwork
2019-12-03 16:43 ` [PATCH 0/4] " Daniel Vetter
2019-12-03 16:43   ` [Intel-gfx] " Daniel Vetter

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=20191125094356.161941-3-daniel.vetter@ffwll.ch \
    --to=daniel.vetter@ffwll.ch \
    --cc=daniel.vetter@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    --cc=matthew.auld@intel.com \
    --cc=tvrtko.ursulin@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.