From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Intel Graphics Development" <intel-gfx@lists.freedesktop.org>, "Jason Ekstrand" <jason@jlekstrand.net>, "Daniel Vetter" <daniel.vetter@intel.com> Subject: [PATCH 6/7] drm/i915: Don't break exclusive fence ordering Date: Tue, 6 Jul 2021 12:12:08 +0200 [thread overview] Message-ID: <20210706101209.3034092-7-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20210706101209.3034092-1-daniel.vetter@ffwll.ch> There's only one exclusive slot, and we must not break the ordering. A better fix would be to us a dma_fence_chain or _array like e.g. amdgpu now uses, but it probably makes sense to lift this into dma-resv.c code as a proper concept, so that drivers don't have to hack up their own solution each on their own. Hence go with the simple fix for now. Another option is the fence import ioctl from Jason: https://lore.kernel.org/dri-devel/20210610210925.642582-7-jason@jlekstrand.net/ Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> Cc: Jason Ekstrand <jason@jlekstrand.net> --- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index 47e07179347a..9d717c8842e2 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -1775,6 +1775,7 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb) struct i915_vma *vma = ev->vma; unsigned int flags = ev->flags; struct drm_i915_gem_object *obj = vma->obj; + bool async, write; assert_vma_held(vma); @@ -1806,7 +1807,10 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb) flags &= ~EXEC_OBJECT_ASYNC; } - if (err == 0 && !(flags & EXEC_OBJECT_ASYNC)) { + async = flags & EXEC_OBJECT_ASYNC; + write = flags & EXEC_OBJECT_WRITE; + + if (err == 0 && (!async || write)) { err = i915_request_await_object (eb->request, obj, flags & EXEC_OBJECT_WRITE); } -- 2.32.0
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Intel Graphics Development" <intel-gfx@lists.freedesktop.org>, "Daniel Vetter" <daniel.vetter@intel.com> Subject: [Intel-gfx] [PATCH 6/7] drm/i915: Don't break exclusive fence ordering Date: Tue, 6 Jul 2021 12:12:08 +0200 [thread overview] Message-ID: <20210706101209.3034092-7-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20210706101209.3034092-1-daniel.vetter@ffwll.ch> There's only one exclusive slot, and we must not break the ordering. A better fix would be to us a dma_fence_chain or _array like e.g. amdgpu now uses, but it probably makes sense to lift this into dma-resv.c code as a proper concept, so that drivers don't have to hack up their own solution each on their own. Hence go with the simple fix for now. Another option is the fence import ioctl from Jason: https://lore.kernel.org/dri-devel/20210610210925.642582-7-jason@jlekstrand.net/ Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> Cc: Jason Ekstrand <jason@jlekstrand.net> --- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index 47e07179347a..9d717c8842e2 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -1775,6 +1775,7 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb) struct i915_vma *vma = ev->vma; unsigned int flags = ev->flags; struct drm_i915_gem_object *obj = vma->obj; + bool async, write; assert_vma_held(vma); @@ -1806,7 +1807,10 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb) flags &= ~EXEC_OBJECT_ASYNC; } - if (err == 0 && !(flags & EXEC_OBJECT_ASYNC)) { + async = flags & EXEC_OBJECT_ASYNC; + write = flags & EXEC_OBJECT_WRITE; + + if (err == 0 && (!async || write)) { err = i915_request_await_object (eb->request, obj, flags & EXEC_OBJECT_WRITE); } -- 2.32.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-07-06 10:12 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-06 10:12 [PATCH 0/7] dma-resv fence DAG fixes Daniel Vetter 2021-07-06 10:12 ` [Intel-gfx] " Daniel Vetter 2021-07-06 10:12 ` [PATCH 1/7] drm/msm: Don't break exclusive fence ordering Daniel Vetter 2021-07-06 10:12 ` [Intel-gfx] " Daniel Vetter 2021-07-06 10:12 ` Daniel Vetter 2021-07-06 10:12 ` [PATCH 2/7] drm/msm: always wait for the exclusive fence Daniel Vetter 2021-07-06 10:12 ` [Intel-gfx] " Daniel Vetter 2021-07-06 10:12 ` Daniel Vetter 2021-07-06 10:12 ` [PATCH 3/7] drm/etnaviv: Don't break exclusive fence ordering Daniel Vetter 2021-07-06 10:12 ` [Intel-gfx] " Daniel Vetter 2021-07-07 8:54 ` Lucas Stach 2021-07-07 8:54 ` [Intel-gfx] " Lucas Stach 2021-07-07 11:37 ` Daniel Vetter 2021-07-07 11:37 ` [Intel-gfx] " Daniel Vetter 2021-07-07 12:31 ` Lucas Stach 2021-07-07 12:31 ` [Intel-gfx] " Lucas Stach 2021-07-07 12:59 ` Daniel Vetter 2021-07-07 12:59 ` [Intel-gfx] " Daniel Vetter 2021-07-06 10:12 ` [PATCH 4/7] drm/i915: delete exclude argument from i915_sw_fence_await_reservation Daniel Vetter 2021-07-06 10:12 ` [Intel-gfx] " Daniel Vetter 2021-07-06 10:12 ` [PATCH 5/7] drm/i915: Always wait for the exclusive fence Daniel Vetter 2021-07-06 10:12 ` [Intel-gfx] " Daniel Vetter 2021-07-06 12:47 ` Matthew Auld 2021-07-06 12:47 ` Matthew Auld 2021-07-06 12:58 ` Daniel Vetter 2021-07-06 12:58 ` Daniel Vetter 2021-07-06 10:12 ` Daniel Vetter [this message] 2021-07-06 10:12 ` [Intel-gfx] [PATCH 6/7] drm/i915: Don't break exclusive fence ordering Daniel Vetter 2021-07-06 10:12 ` [PATCH 7/7] dma-resv: Give the docs a do-over Daniel Vetter 2021-07-06 10:12 ` [Intel-gfx] " Daniel Vetter 2021-07-06 10:12 ` Daniel Vetter 2021-07-06 12:34 ` [Intel-gfx] " Matthew Auld 2021-07-06 12:34 ` Matthew Auld 2021-07-06 12:34 ` Matthew Auld 2021-07-06 23:47 ` Jason Ekstrand 2021-07-06 23:47 ` [Intel-gfx] " Jason Ekstrand 2021-07-06 23:47 ` Jason Ekstrand 2021-07-07 8:06 ` [Linaro-mm-sig] " Christian König 2021-07-07 8:06 ` [Intel-gfx] " Christian König 2021-07-07 8:06 ` Christian König 2021-07-07 9:13 ` Daniel Vetter 2021-07-07 9:13 ` [Intel-gfx] " Daniel Vetter 2021-07-07 9:13 ` Daniel Vetter 2021-07-06 10:35 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for dma-resv fence DAG fixes 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=20210706101209.3034092-7-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=jason@jlekstrand.net \ --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: 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.