From: Matthew Auld <matthew.auld@intel.com> To: intel-gfx@lists.freedesktop.org Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, "Tvrtko Ursulin" <tvrtko.ursulin@linux.intel.com>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Lionel Landwerlin" <lionel.g.landwerlin@intel.com>, "Kenneth Graunke" <kenneth@whitecape.org>, "Jon Bloomfield" <jon.bloomfield@intel.com>, dri-devel@lists.freedesktop.org, "Jordan Justen" <jordan.l.justen@intel.com>, "Akeem G Abodunrin" <akeem.g.abodunrin@intel.com> Subject: [PATCH v2 08/12] drm/i915/uapi: tweak error capture on recoverable contexts Date: Tue, 21 Jun 2022 11:44:30 +0100 [thread overview] Message-ID: <20220621104434.190962-9-matthew.auld@intel.com> (raw) In-Reply-To: <20220621104434.190962-1-matthew.auld@intel.com> A non-recoverable context must be used if the user wants proper error capture on discrete platforms. In the future the kernel may want to blit the contents of some objects when later doing the capture stage. Also extend to newer integrated platforms. v2(Thomas): - Also extend to newer integrated platforms, for capture buffer memory allocation purposes. Testcase: igt@gem_exec_capture@capture-recoverable 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/i915_gem_execbuffer.c | 14 +++++++++++--- 1 file changed, 11 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 30fe847c6664..6ac88e2193f1 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -1951,7 +1951,7 @@ eb_find_first_request_added(struct i915_execbuffer *eb) #if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR) /* Stage with GFP_KERNEL allocations before we enter the signaling critical path */ -static void eb_capture_stage(struct i915_execbuffer *eb) +static int eb_capture_stage(struct i915_execbuffer *eb) { const unsigned int count = eb->buffer_count; unsigned int i = count, j; @@ -1964,6 +1964,10 @@ static void eb_capture_stage(struct i915_execbuffer *eb) if (!(flags & EXEC_OBJECT_CAPTURE)) continue; + if (i915_gem_context_is_recoverable(eb->gem_context) && + (IS_DGFX(eb->i915) || GRAPHICS_VER_FULL(eb->i915) > IP_VER(12, 0))) + return -EINVAL; + for_each_batch_create_order(eb, j) { struct i915_capture_list *capture; @@ -1976,6 +1980,8 @@ static void eb_capture_stage(struct i915_execbuffer *eb) eb->capture_lists[j] = capture; } } + + return 0; } /* Commit once we're in the critical path */ @@ -2017,7 +2023,7 @@ static void eb_capture_list_clear(struct i915_execbuffer *eb) #else -static void eb_capture_stage(struct i915_execbuffer *eb) +static int eb_capture_stage(struct i915_execbuffer *eb) { } @@ -3410,7 +3416,9 @@ i915_gem_do_execbuffer(struct drm_device *dev, } ww_acquire_done(&eb.ww.ctx); - eb_capture_stage(&eb); + err = eb_capture_stage(&eb); + if (err) + goto err_vma; out_fence = eb_requests_create(&eb, in_fence, out_fence_fd); if (IS_ERR(out_fence)) { -- 2.36.1
WARNING: multiple messages have this Message-ID (diff)
From: Matthew Auld <matthew.auld@intel.com> To: intel-gfx@lists.freedesktop.org Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Kenneth Graunke" <kenneth@whitecape.org>, dri-devel@lists.freedesktop.org Subject: [Intel-gfx] [PATCH v2 08/12] drm/i915/uapi: tweak error capture on recoverable contexts Date: Tue, 21 Jun 2022 11:44:30 +0100 [thread overview] Message-ID: <20220621104434.190962-9-matthew.auld@intel.com> (raw) In-Reply-To: <20220621104434.190962-1-matthew.auld@intel.com> A non-recoverable context must be used if the user wants proper error capture on discrete platforms. In the future the kernel may want to blit the contents of some objects when later doing the capture stage. Also extend to newer integrated platforms. v2(Thomas): - Also extend to newer integrated platforms, for capture buffer memory allocation purposes. Testcase: igt@gem_exec_capture@capture-recoverable 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/i915_gem_execbuffer.c | 14 +++++++++++--- 1 file changed, 11 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 30fe847c6664..6ac88e2193f1 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -1951,7 +1951,7 @@ eb_find_first_request_added(struct i915_execbuffer *eb) #if IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR) /* Stage with GFP_KERNEL allocations before we enter the signaling critical path */ -static void eb_capture_stage(struct i915_execbuffer *eb) +static int eb_capture_stage(struct i915_execbuffer *eb) { const unsigned int count = eb->buffer_count; unsigned int i = count, j; @@ -1964,6 +1964,10 @@ static void eb_capture_stage(struct i915_execbuffer *eb) if (!(flags & EXEC_OBJECT_CAPTURE)) continue; + if (i915_gem_context_is_recoverable(eb->gem_context) && + (IS_DGFX(eb->i915) || GRAPHICS_VER_FULL(eb->i915) > IP_VER(12, 0))) + return -EINVAL; + for_each_batch_create_order(eb, j) { struct i915_capture_list *capture; @@ -1976,6 +1980,8 @@ static void eb_capture_stage(struct i915_execbuffer *eb) eb->capture_lists[j] = capture; } } + + return 0; } /* Commit once we're in the critical path */ @@ -2017,7 +2023,7 @@ static void eb_capture_list_clear(struct i915_execbuffer *eb) #else -static void eb_capture_stage(struct i915_execbuffer *eb) +static int eb_capture_stage(struct i915_execbuffer *eb) { } @@ -3410,7 +3416,9 @@ i915_gem_do_execbuffer(struct drm_device *dev, } ww_acquire_done(&eb.ww.ctx); - eb_capture_stage(&eb); + err = eb_capture_stage(&eb); + if (err) + goto err_vma; out_fence = eb_requests_create(&eb, in_fence, out_fence_fd); if (IS_ERR(out_fence)) { -- 2.36.1
next prev parent reply other threads:[~2022-06-21 10:47 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-21 10:44 [PATCH v2 00/12] small BAR uapi bits Matthew Auld 2022-06-21 10:44 ` [Intel-gfx] " Matthew Auld 2022-06-21 10:44 ` [PATCH v2 01/12] drm/doc: add rfc section for small BAR uapi Matthew Auld 2022-06-21 10:44 ` [Intel-gfx] " Matthew Auld 2022-06-21 12:26 ` Thomas Hellström 2022-06-21 12:26 ` [Intel-gfx] " Thomas Hellström 2022-06-21 18:31 ` Lionel Landwerlin 2022-06-21 18:31 ` [Intel-gfx] " Lionel Landwerlin 2022-06-21 19:38 ` Jordan Justen 2022-06-21 19:38 ` [Intel-gfx] " Jordan Justen 2022-06-21 10:44 ` [PATCH v2 02/12] drm/i915/uapi: add probed_cpu_visible_size Matthew Auld 2022-06-21 10:44 ` [Intel-gfx] " Matthew Auld 2022-06-21 10:44 ` [PATCH v2 03/12] drm/i915/uapi: expose the avail tracking Matthew Auld 2022-06-21 10:44 ` [Intel-gfx] " Matthew Auld 2022-06-21 19:44 ` kernel test robot 2022-06-21 19:44 ` kernel test robot 2022-06-21 19:44 ` [Intel-gfx] " kernel test robot 2022-06-22 14:19 ` Thomas Hellström 2022-06-22 14:19 ` [Intel-gfx] " Thomas Hellström 2022-06-21 10:44 ` [PATCH v2 04/12] drm/i915: remove intel_memory_region avail Matthew Auld 2022-06-21 10:44 ` [Intel-gfx] " Matthew Auld 2022-06-21 10:44 ` [PATCH v2 05/12] drm/i915/uapi: apply ALLOC_GPU_ONLY by default Matthew Auld 2022-06-21 10:44 ` [Intel-gfx] " Matthew Auld 2022-06-21 10:44 ` [PATCH v2 06/12] drm/i915/uapi: add NEEDS_CPU_ACCESS hint Matthew Auld 2022-06-21 10:44 ` [Intel-gfx] " Matthew Auld 2022-06-21 10:44 ` [PATCH v2 07/12] drm/i915/error: skip non-mappable pages Matthew Auld 2022-06-21 10:44 ` [Intel-gfx] " Matthew Auld 2022-06-21 10:44 ` Matthew Auld [this message] 2022-06-21 10:44 ` [Intel-gfx] [PATCH v2 08/12] drm/i915/uapi: tweak error capture on recoverable contexts Matthew Auld 2022-06-21 22:06 ` kernel test robot 2022-06-21 22:06 ` kernel test robot 2022-06-21 22:06 ` [Intel-gfx] " kernel test robot 2022-06-21 10:44 ` [PATCH v2 09/12] drm/i915/selftests: ensure we reserve a fence slot Matthew Auld 2022-06-21 10:44 ` [Intel-gfx] " Matthew Auld 2022-06-22 14:23 ` Thomas Hellström 2022-06-22 14:23 ` [Intel-gfx] " Thomas Hellström 2022-06-21 10:44 ` [PATCH v2 10/12] drm/i915/ttm: handle blitter failure on DG2 Matthew Auld 2022-06-21 10:44 ` [Intel-gfx] " Matthew Auld 2022-06-23 7:00 ` Thomas Hellström 2022-06-23 7:00 ` [Intel-gfx] " Thomas Hellström 2022-06-23 14:13 ` Matthew Auld 2022-06-23 14:13 ` [Intel-gfx] " Matthew Auld 2022-06-23 14:52 ` Christian König 2022-06-23 14:52 ` [Intel-gfx] " Christian König 2022-06-23 15:31 ` Matthew Auld 2022-06-23 15:31 ` [Intel-gfx] " Matthew Auld 2022-06-27 10:48 ` Matthew Auld 2022-06-21 10:44 ` [PATCH v2 11/12] drm/i915: turn on small BAR support Matthew Auld 2022-06-21 10:44 ` [Intel-gfx] " Matthew Auld 2022-06-21 10:44 ` [PATCH v2 12/12] HAX: force small BAR on dg2 Matthew Auld 2022-06-21 10:44 ` [Intel-gfx] " Matthew Auld 2022-06-21 11:46 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for small BAR uapi bits (rev2) Patchwork 2022-06-21 11:46 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2022-06-21 12:05 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2022-06-21 21:37 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork 2022-06-22 20:02 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for small BAR uapi bits (rev3) Patchwork 2022-06-22 20:02 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2022-06-22 20:25 ` [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=20220621104434.190962-9-matthew.auld@intel.com \ --to=matthew.auld@intel.com \ --cc=akeem.g.abodunrin@intel.com \ --cc=daniel.vetter@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jon.bloomfield@intel.com \ --cc=jordan.l.justen@intel.com \ --cc=kenneth@whitecape.org \ --cc=lionel.g.landwerlin@intel.com \ --cc=thomas.hellstrom@linux.intel.com \ --cc=tvrtko.ursulin@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: linkBe 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.