From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 15/28] drm/i915: Add lock for unbinding to i915_gem_object_ggtt_pin_ww
Date: Thu, 21 Oct 2021 12:35:52 +0200 [thread overview]
Message-ID: <20211021103605.735002-15-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <20211021103605.735002-1-maarten.lankhorst@linux.intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
drivers/gpu/drm/i915/i915_gem.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 981e383d1a5d..6aa9e465b48e 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -931,7 +931,14 @@ i915_gem_object_ggtt_pin_ww(struct drm_i915_gem_object *obj,
goto new_vma;
}
- ret = i915_vma_unbind(vma);
+ ret = 0;
+ if (!ww)
+ ret = i915_gem_object_lock_interruptible(obj, NULL);
+ if (!ret) {
+ ret = i915_vma_unbind(vma);
+ if (!ww)
+ i915_gem_object_unlock(obj);
+ }
if (ret)
return ERR_PTR(ret);
}
--
2.33.0
next prev parent reply other threads:[~2021-10-21 10:37 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-21 10:35 [PATCH 01/28] drm/i915: Fix i915_request fence wait semantics Maarten Lankhorst
2021-10-21 10:35 ` [PATCH 02/28] drm/i915: use new iterator in i915_gem_object_wait_reservation Maarten Lankhorst
2021-10-21 10:38 ` Christian König
2021-10-21 11:06 ` Maarten Lankhorst
2021-10-21 11:13 ` [Intel-gfx] " Tvrtko Ursulin
2021-10-28 8:41 ` Christian König
2021-10-28 15:30 ` Daniel Vetter
2021-11-01 9:41 ` Tvrtko Ursulin
2021-11-11 11:36 ` Christian König
2021-11-12 16:07 ` Daniel Vetter
2021-10-21 10:35 ` [PATCH 03/28] drm/i915: Remove dma_resv_prune Maarten Lankhorst
2021-10-21 14:43 ` Matthew Auld
2021-10-22 8:48 ` Maarten Lankhorst
2021-10-21 10:35 ` [PATCH 04/28] drm/i915: Remove unused bits of i915_vma/active api Maarten Lankhorst
2021-10-21 10:35 ` [PATCH 05/28] drm/i915: Slightly rework EXEC_OBJECT_CAPTURE handling, v2 Maarten Lankhorst
2021-10-21 10:35 ` [PATCH 06/28] drm/i915: Remove gen6_ppgtt_unpin_all Maarten Lankhorst
2021-10-21 10:35 ` [PATCH 07/28] drm/i915: Create a dummy object for gen6 ppgtt Maarten Lankhorst
2021-10-21 15:42 ` [Intel-gfx] " Matthew Auld
2021-10-21 10:35 ` [PATCH 08/28] drm/i915: Create a full object for mock_ring, v2 Maarten Lankhorst
2021-10-21 15:57 ` Matthew Auld
2021-10-22 11:03 ` Maarten Lankhorst
2021-10-21 10:35 ` [PATCH 09/28] drm/i915: vma is always backed by an object Maarten Lankhorst
2021-10-21 16:09 ` [Intel-gfx] " Matthew Auld
2021-10-21 10:35 ` [PATCH 10/28] drm/i915: Change shrink ordering to use locking around unbinding Maarten Lankhorst
2021-10-21 16:12 ` [Intel-gfx] " Matthew Auld
2021-10-22 11:04 ` Maarten Lankhorst
2021-10-21 10:35 ` [PATCH 11/28] drm/i915/pm: Move CONTEXT_VALID_BIT check Maarten Lankhorst
2021-11-02 16:13 ` [Intel-gfx] " Matthew Auld
2021-10-21 10:35 ` [PATCH 12/28] drm/i915: Remove resv from i915_vma Maarten Lankhorst
2021-10-21 10:35 ` [PATCH 13/28] drm/i915: Remove pages_mutex and intel_gtt->vma_ops.set/clear_pages members Maarten Lankhorst
2021-10-21 17:30 ` [Intel-gfx] " Matthew Auld
2021-10-22 10:59 ` Matthew Auld
2021-11-29 12:40 ` Maarten Lankhorst
2021-10-21 10:35 ` [PATCH 14/28] drm/i915: Take object lock in i915_ggtt_pin if ww is not set Maarten Lankhorst
2021-10-21 17:39 ` [Intel-gfx] " Matthew Auld
2021-11-29 12:46 ` Maarten Lankhorst
2021-10-21 10:35 ` Maarten Lankhorst [this message]
2021-10-21 17:48 ` [Intel-gfx] [PATCH 15/28] drm/i915: Add lock for unbinding to i915_gem_object_ggtt_pin_ww Matthew Auld
2021-11-29 13:25 ` Maarten Lankhorst
2021-10-21 10:35 ` [PATCH 16/28] drm/i915: Rework context handling in hugepages selftests Maarten Lankhorst
2021-10-21 17:55 ` [Intel-gfx] " Matthew Auld
2021-10-22 6:51 ` kernel test robot
2021-10-22 7:21 ` kernel test robot
2021-10-21 10:35 ` [PATCH 17/28] drm/i915: Ensure gem_contexts selftests work with unbind changes Maarten Lankhorst
2021-10-21 10:35 ` [PATCH 18/28] drm/i915: Take trylock during eviction, v2 Maarten Lankhorst
2021-10-21 17:59 ` [Intel-gfx] " Matthew Auld
2021-10-22 8:44 ` Maarten Lankhorst
2021-10-21 10:35 ` [PATCH 19/28] drm/i915: Pass trylock context to callers Maarten Lankhorst
2021-10-21 18:03 ` [Intel-gfx] " Matthew Auld
2021-10-22 8:52 ` Maarten Lankhorst
2021-10-21 10:35 ` [PATCH 20/28] drm/i915: Ensure i915_vma tests do not get -ENOSPC with the locking changes Maarten Lankhorst
2021-10-21 10:35 ` [PATCH 21/28] drm/i915: Drain the ttm delayed workqueue too Maarten Lankhorst
2021-10-25 15:11 ` Matthew Auld
2021-10-21 10:35 ` [PATCH 22/28] drm/i915: Make i915_gem_evict_vm work correctly for already locked objects Maarten Lankhorst
2021-10-21 10:36 ` [PATCH 23/28] drm/i915: Call i915_gem_evict_vm in vm_fault_gtt to prevent new ENOSPC errors Maarten Lankhorst
2021-10-21 10:36 ` [PATCH 24/28] drm/i915: Add i915_vma_unbind_unlocked, and take obj lock for i915_vma_unbind Maarten Lankhorst
2021-10-21 10:36 ` [PATCH 25/28] drm/i915: Require object lock when freeing pages during destruction Maarten Lankhorst
2021-10-22 11:10 ` [Intel-gfx] " Matthew Auld
2021-10-21 10:36 ` [PATCH 26/28] drm/i915: Remove assert_object_held_shared Maarten Lankhorst
2021-10-21 10:36 ` [PATCH 27/28] drm/i915: Remove support for unlocked i915_vma unbind Maarten Lankhorst
2021-10-21 10:36 ` [PATCH 28/28] drm/i915: Remove short-term pins from execbuf, v4 Maarten Lankhorst
2021-10-25 15:02 ` Matthew Auld
2021-11-29 13:44 ` Maarten Lankhorst
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=20211021103605.735002-15-maarten.lankhorst@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@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