From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
Subject: [Intel-gfx] [PATCH v7 24/63] drm/i915: Move pinning to inside engine_wa_list_verify()
Date: Thu, 28 Jan 2021 17:25:33 +0100 [thread overview]
Message-ID: <20210128162612.927917-25-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <20210128162612.927917-1-maarten.lankhorst@linux.intel.com>
This should be done as part of the ww loop, in order to remove a
i915_vma_pin that needs ww held.
Now only i915_ggtt_pin() callers remaining.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
drivers/gpu/drm/i915/gt/intel_gtt.c | 14 +++++++++++++-
drivers/gpu/drm/i915/gt/intel_gtt.h | 3 +++
drivers/gpu/drm/i915/gt/intel_workarounds.c | 10 ++++++++--
drivers/gpu/drm/i915/gt/selftest_execlists.c | 5 +++--
drivers/gpu/drm/i915/gt/selftest_lrc.c | 2 +-
drivers/gpu/drm/i915/gt/selftest_mocs.c | 3 ++-
drivers/gpu/drm/i915/gt/selftest_workarounds.c | 6 +++---
7 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_gtt.c b/drivers/gpu/drm/i915/gt/intel_gtt.c
index 04aa6601e984..444d9bacfafd 100644
--- a/drivers/gpu/drm/i915/gt/intel_gtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_gtt.c
@@ -427,7 +427,6 @@ __vm_create_scratch_for_read(struct i915_address_space *vm, unsigned long size)
{
struct drm_i915_gem_object *obj;
struct i915_vma *vma;
- int err;
obj = i915_gem_object_create_internal(vm->i915, PAGE_ALIGN(size));
if (IS_ERR(obj))
@@ -441,6 +440,19 @@ __vm_create_scratch_for_read(struct i915_address_space *vm, unsigned long size)
return vma;
}
+ return vma;
+}
+
+struct i915_vma *
+__vm_create_scratch_for_read_pinned(struct i915_address_space *vm, unsigned long size)
+{
+ struct i915_vma *vma;
+ int err;
+
+ vma = __vm_create_scratch_for_read(vm, size);
+ if (IS_ERR(vma))
+ return vma;
+
err = i915_vma_pin(vma, 0, 0,
i915_vma_is_ggtt(vma) ? PIN_GLOBAL : PIN_USER);
if (err) {
diff --git a/drivers/gpu/drm/i915/gt/intel_gtt.h b/drivers/gpu/drm/i915/gt/intel_gtt.h
index 29c10fde8ce3..af90090c3d18 100644
--- a/drivers/gpu/drm/i915/gt/intel_gtt.h
+++ b/drivers/gpu/drm/i915/gt/intel_gtt.h
@@ -576,6 +576,9 @@ void i915_vm_free_pt_stash(struct i915_address_space *vm,
struct i915_vma *
__vm_create_scratch_for_read(struct i915_address_space *vm, unsigned long size);
+struct i915_vma *
+__vm_create_scratch_for_read_pinned(struct i915_address_space *vm, unsigned long size);
+
static inline struct sgt_dma {
struct scatterlist *sg;
dma_addr_t dma, max;
diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
index 71d1c19c868b..720508337dc5 100644
--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@ -2203,10 +2203,15 @@ static int engine_wa_list_verify(struct intel_context *ce,
if (err)
goto err_pm;
+ err = i915_vma_pin_ww(vma, &ww, 0, 0,
+ i915_vma_is_ggtt(vma) ? PIN_GLOBAL : PIN_USER);
+ if (err)
+ goto err_unpin;
+
rq = i915_request_create(ce);
if (IS_ERR(rq)) {
err = PTR_ERR(rq);
- goto err_unpin;
+ goto err_vma;
}
err = i915_request_await_object(rq, vma->obj, true);
@@ -2247,6 +2252,8 @@ static int engine_wa_list_verify(struct intel_context *ce,
err_rq:
i915_request_put(rq);
+err_vma:
+ i915_vma_unpin(vma);
err_unpin:
intel_context_unpin(ce);
err_pm:
@@ -2257,7 +2264,6 @@ static int engine_wa_list_verify(struct intel_context *ce,
}
i915_gem_ww_ctx_fini(&ww);
intel_engine_pm_put(ce->engine);
- i915_vma_unpin(vma);
i915_vma_put(vma);
return err;
}
diff --git a/drivers/gpu/drm/i915/gt/selftest_execlists.c b/drivers/gpu/drm/i915/gt/selftest_execlists.c
index 5d7fac383add..9deed904371d 100644
--- a/drivers/gpu/drm/i915/gt/selftest_execlists.c
+++ b/drivers/gpu/drm/i915/gt/selftest_execlists.c
@@ -4181,8 +4181,9 @@ static int preserved_virtual_engine(struct intel_gt *gt,
int err = 0;
u32 *cs;
- scratch = __vm_create_scratch_for_read(&siblings[0]->gt->ggtt->vm,
- PAGE_SIZE);
+ scratch =
+ __vm_create_scratch_for_read_pinned(&siblings[0]->gt->ggtt->vm,
+ PAGE_SIZE);
if (IS_ERR(scratch))
return PTR_ERR(scratch);
diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c
index 7bf34c439876..f74addad98ac 100644
--- a/drivers/gpu/drm/i915/gt/selftest_lrc.c
+++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c
@@ -27,7 +27,7 @@
static struct i915_vma *create_scratch(struct intel_gt *gt)
{
- return __vm_create_scratch_for_read(>->ggtt->vm, PAGE_SIZE);
+ return __vm_create_scratch_for_read_pinned(>->ggtt->vm, PAGE_SIZE);
}
static bool is_active(struct i915_request *rq)
diff --git a/drivers/gpu/drm/i915/gt/selftest_mocs.c b/drivers/gpu/drm/i915/gt/selftest_mocs.c
index e6f6807487d4..5d2e515f4e2d 100644
--- a/drivers/gpu/drm/i915/gt/selftest_mocs.c
+++ b/drivers/gpu/drm/i915/gt/selftest_mocs.c
@@ -74,7 +74,8 @@ static int live_mocs_init(struct live_mocs *arg, struct intel_gt *gt)
if (flags & (HAS_GLOBAL_MOCS | HAS_ENGINE_MOCS))
arg->mocs = table;
- arg->scratch = __vm_create_scratch_for_read(>->ggtt->vm, PAGE_SIZE);
+ arg->scratch =
+ __vm_create_scratch_for_read_pinned(>->ggtt->vm, PAGE_SIZE);
if (IS_ERR(arg->scratch))
return PTR_ERR(arg->scratch);
diff --git a/drivers/gpu/drm/i915/gt/selftest_workarounds.c b/drivers/gpu/drm/i915/gt/selftest_workarounds.c
index af33a720dbf8..40b79791ce69 100644
--- a/drivers/gpu/drm/i915/gt/selftest_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/selftest_workarounds.c
@@ -489,7 +489,7 @@ static int check_dirty_whitelist(struct intel_context *ce)
u32 *cs, *results;
sz = (2 * ARRAY_SIZE(values) + 1) * sizeof(u32);
- scratch = __vm_create_scratch_for_read(ce->vm, sz);
+ scratch = __vm_create_scratch_for_read_pinned(ce->vm, sz);
if (IS_ERR(scratch))
return PTR_ERR(scratch);
@@ -1029,14 +1029,14 @@ static int live_isolated_whitelist(void *arg)
for (i = 0; i < ARRAY_SIZE(client); i++) {
client[i].scratch[0] =
- __vm_create_scratch_for_read(gt->vm, 4096);
+ __vm_create_scratch_for_read_pinned(gt->vm, 4096);
if (IS_ERR(client[i].scratch[0])) {
err = PTR_ERR(client[i].scratch[0]);
goto err;
}
client[i].scratch[1] =
- __vm_create_scratch_for_read(gt->vm, 4096);
+ __vm_create_scratch_for_read_pinned(gt->vm, 4096);
if (IS_ERR(client[i].scratch[1])) {
err = PTR_ERR(client[i].scratch[1]);
i915_vma_unpin_and_release(&client[i].scratch[0], 0);
--
2.30.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-01-28 16:27 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-28 16:25 [Intel-gfx] [PATCH v7 00/63] drm/i915: Remove obj->mm.lock! Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 01/63] drm/i915: Do not share hwsp across contexts any more, v7 Maarten Lankhorst
2021-01-28 17:42 ` Chris Wilson
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 02/63] drm/i915: Pin timeline map after first timeline pin, v3 Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 03/63] drm/i915: Move cmd parser pinning to execbuffer Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 04/63] drm/i915: Add missing -EDEADLK handling to execbuf pinning, v2 Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 05/63] drm/i915: Ensure we hold the object mutex in pin correctly Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 06/63] drm/i915: Add gem object locking to madvise Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 07/63] drm/i915: Move HAS_STRUCT_PAGE to obj->flags Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 08/63] drm/i915: Rework struct phys attachment handling Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 09/63] drm/i915: Convert i915_gem_object_attach_phys() to ww locking, v2 Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 10/63] drm/i915: make lockdep slightly happier about execbuf Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 11/63] drm/i915: Disable userptr pread/pwrite support Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 12/63] drm/i915: No longer allow exporting userptr through dma-buf Maarten Lankhorst
2021-01-28 16:44 ` Jason Ekstrand
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 13/63] drm/i915: Reject more ioctls for userptr Maarten Lankhorst
2021-01-28 16:47 ` Jason Ekstrand
2021-01-29 11:42 ` Maarten Lankhorst
2021-02-01 19:11 ` Jason Ekstrand
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 14/63] drm/i915: Reject UNSYNCHRONIZED for userptr, v2 Maarten Lankhorst
2021-01-28 16:49 ` Jason Ekstrand
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 15/63] drm/i915: Make compilation of userptr code depend on MMU_NOTIFIER Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 16/63] drm/i915: Fix userptr so we do not have to worry about obj->mm.lock, v6 Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 17/63] drm/i915: Flatten obj->mm.lock Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 18/63] drm/i915: Populate logical context during first pin Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 19/63] drm/i915: Make ring submission compatible with obj->mm.lock removal, v2 Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 20/63] drm/i915: Handle ww locking in init_status_page Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 21/63] drm/i915: Rework clflush to work correctly without obj->mm.lock Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 22/63] drm/i915: Pass ww ctx to intel_pin_to_display_plane Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 23/63] drm/i915: Add object locking to vm_fault_cpu Maarten Lankhorst
2021-01-28 16:25 ` Maarten Lankhorst [this message]
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 25/63] drm/i915: Take reservation lock around i915_vma_pin Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 26/63] drm/i915: Make lrc_init_wa_ctx compatible with ww locking, v2 Maarten Lankhorst
2021-02-01 12:50 ` [Intel-gfx] [PATCH] drm/i915: Make lrc_init_wa_ctx compatible with ww locking, v3 Maarten Lankhorst
2021-02-01 13:03 ` Thomas Hellström
2021-02-01 13:08 ` Chris Wilson
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 27/63] drm/i915: Make __engine_unpark() compatible with ww locking Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 28/63] drm/i915: Take obj lock around set_domain ioctl Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 29/63] drm/i915: Defer pin calls in buffer pool until first use by caller Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 30/63] drm/i915: Fix pread/pwrite to work with new locking rules Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 31/63] drm/i915: Fix workarounds selftest, part 1 Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 32/63] drm/i915: Prepare for obj->mm.lock removal, v2 Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 33/63] drm/i915: Add igt_spinner_pin() to allow for ww locking around spinner Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 34/63] drm/i915: Add ww locking around vm_access() Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 35/63] drm/i915: Increase ww locking for perf Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 36/63] drm/i915: Lock ww in ucode objects correctly Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 37/63] drm/i915: Add ww locking to dma-buf ops Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 38/63] drm/i915: Add missing ww lock in intel_dsb_prepare Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 39/63] drm/i915: Fix ww locking in shmem_create_from_object Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 40/63] drm/i915: Use a single page table lock for each gtt Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 41/63] drm/i915/selftests: Prepare huge_pages testcases for obj->mm.lock removal Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 42/63] drm/i915/selftests: Prepare client blit " Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 43/63] drm/i915/selftests: Prepare coherency tests " Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 44/63] drm/i915/selftests: Prepare context " Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 45/63] drm/i915/selftests: Prepare dma-buf " Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 46/63] drm/i915/selftests: Prepare execbuf " Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 47/63] drm/i915/selftests: Prepare mman testcases " Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 48/63] drm/i915/selftests: Prepare object tests " Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 49/63] drm/i915/selftests: Prepare object blit " Maarten Lankhorst
2021-01-28 16:25 ` [Intel-gfx] [PATCH v7 50/63] drm/i915/selftests: Prepare igt_gem_utils " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 51/63] drm/i915/selftests: Prepare context selftest " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 52/63] drm/i915/selftests: Prepare hangcheck " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 53/63] drm/i915/selftests: Prepare execlists and lrc selftests " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 54/63] drm/i915/selftests: Prepare mocs tests " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 55/63] drm/i915/selftests: Prepare ring submission " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 56/63] drm/i915/selftests: Prepare timeline tests " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 57/63] drm/i915/selftests: Prepare i915_request " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 58/63] drm/i915/selftests: Prepare memory region " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 59/63] drm/i915/selftests: Prepare cs engine " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 60/63] drm/i915/selftests: Prepare gtt " Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 61/63] drm/i915: Finally remove obj->mm.lock Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 62/63] drm/i915: Keep userpointer bindings if seqcount is unchanged, v2 Maarten Lankhorst
2021-01-28 16:26 ` [Intel-gfx] [PATCH v7 63/63] drm/i915: Move gt_revoke() slightly Maarten Lankhorst
2021-01-28 17:50 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Remove obj->mm.lock! (rev14) Patchwork
2021-01-28 17:51 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-01-28 17:54 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
2021-01-28 18:20 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2021-01-29 15:28 ` [Intel-gfx] ✗ Fi.CI.IGT: " Patchwork
2021-02-01 16:20 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Remove obj->mm.lock! (rev15) Patchwork
2021-02-01 16:22 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-02-01 16:25 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
2021-02-01 16:51 ` [Intel-gfx] ✗ Fi.CI.BAT: 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=20210128162612.927917-25-maarten.lankhorst@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--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 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).