From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [CI v4 10/13] drm/i915/selftests: ensure we reserve a fence slot
Date: Wed, 29 Jun 2022 18:43:47 +0100 [thread overview]
Message-ID: <20220629174350.384910-10-matthew.auld@intel.com> (raw)
In-Reply-To: <20220629174350.384910-1-matthew.auld@intel.com>
We should always be explicit and allocate a fence slot before adding a
new fence.
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Jon Bloomfield <jon.bloomfield@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Kenneth Graunke <kenneth@whitecape.org>
Cc: Akeem G Abodunrin <akeem.g.abodunrin@intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
index 388c85b0f764..da28acb78a88 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
@@ -1224,8 +1224,10 @@ static int __igt_mmap_migrate(struct intel_memory_region **placements,
expand32(POISON_INUSE), &rq);
i915_gem_object_unpin_pages(obj);
if (rq) {
- dma_resv_add_fence(obj->base.resv, &rq->fence,
- DMA_RESV_USAGE_KERNEL);
+ err = dma_resv_reserve_fences(obj->base.resv, 1);
+ if (!err)
+ dma_resv_add_fence(obj->base.resv, &rq->fence,
+ DMA_RESV_USAGE_KERNEL);
i915_request_put(rq);
}
i915_gem_object_unlock(obj);
--
2.36.1
next prev parent reply other threads:[~2022-06-29 17:44 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-29 17:43 [Intel-gfx] [CI v4 01/13] drm/doc: add rfc section for small BAR uapi Matthew Auld
2022-06-29 17:43 ` [Intel-gfx] [CI v4 02/13] drm/i915/uapi: add probed_cpu_visible_size Matthew Auld
2022-06-29 17:43 ` [Intel-gfx] [CI v4 03/13] drm/i915/uapi: expose the avail tracking Matthew Auld
2022-06-29 17:43 ` [Intel-gfx] [CI v4 04/13] drm/i915: remove intel_memory_region avail Matthew Auld
2022-06-29 17:43 ` [Intel-gfx] [CI v4 05/13] drm/i915/uapi: apply ALLOC_GPU_ONLY by default Matthew Auld
2022-06-29 17:43 ` [Intel-gfx] [CI v4 06/13] drm/i915/uapi: add NEEDS_CPU_ACCESS hint Matthew Auld
2022-06-29 17:43 ` [Intel-gfx] [CI v4 07/13] drm/i915/error: skip non-mappable pages Matthew Auld
2022-06-29 17:43 ` [Intel-gfx] [CI v4 08/13] drm/i915/uapi: tweak error capture on recoverable contexts Matthew Auld
2022-06-29 17:43 ` [Intel-gfx] [CI v4 09/13] drm/i915/selftests: skip the mman tests for stolen Matthew Auld
2022-06-29 17:43 ` Matthew Auld [this message]
2022-06-29 17:43 ` [Intel-gfx] [CI v4 11/13] drm/i915/ttm: handle blitter failure on DG2 Matthew Auld
2022-06-29 17:43 ` [Intel-gfx] [CI v4 12/13] drm/i915/ttm: disallow CPU fallback mode for ccs pages Matthew Auld
2022-07-25 14:55 ` Tvrtko Ursulin
2022-07-25 15:09 ` Matthew Auld
2022-07-25 15:11 ` Tvrtko Ursulin
2022-06-29 17:43 ` [Intel-gfx] [CI v4 13/13] drm/i915: turn on small BAR support Matthew Auld
2022-06-29 18:08 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [CI,v4,01/13] drm/doc: add rfc section for small BAR uapi Patchwork
2022-06-29 18:33 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-06-30 9:42 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2022-06-30 12:38 ` Matthew Auld
2022-06-30 19:03 ` Vudum, Lakshminarayana
2022-06-30 15:37 ` Patchwork
2022-06-30 16:29 ` Patchwork
2022-06-30 18:58 ` [Intel-gfx] ✓ Fi.CI.IGT: success " 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=20220629174350.384910-10-matthew.auld@intel.com \
--to=matthew.auld@intel.com \
--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 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.