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 5/7] drm/i915: Always wait for the exclusive fence Date: Tue, 6 Jul 2021 12:12:07 +0200 [thread overview] Message-ID: <20210706101209.3034092-6-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20210706101209.3034092-1-daniel.vetter@ffwll.ch> We're lifting, or well, clarifying that the restriction that shared fences have to be strictly after the exclusive one doesn't apply anymore. So adjust the code to always also wait for the exclusive fence. 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/i915_sw_fence.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c index 91711a46b1c7..271d321cea83 100644 --- a/drivers/gpu/drm/i915/i915_sw_fence.c +++ b/drivers/gpu/drm/i915/i915_sw_fence.c @@ -601,10 +601,10 @@ int i915_sw_fence_await_reservation(struct i915_sw_fence *fence, for (i = 0; i < count; i++) dma_fence_put(shared[i]); kfree(shared); - } else { - excl = dma_resv_get_excl_unlocked(resv); } + excl = dma_resv_get_excl_unlocked(resv); + if (ret >= 0 && excl) { pending = i915_sw_fence_await_dma_fence(fence, excl, -- 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 5/7] drm/i915: Always wait for the exclusive fence Date: Tue, 6 Jul 2021 12:12:07 +0200 [thread overview] Message-ID: <20210706101209.3034092-6-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20210706101209.3034092-1-daniel.vetter@ffwll.ch> We're lifting, or well, clarifying that the restriction that shared fences have to be strictly after the exclusive one doesn't apply anymore. So adjust the code to always also wait for the exclusive fence. 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/i915_sw_fence.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c index 91711a46b1c7..271d321cea83 100644 --- a/drivers/gpu/drm/i915/i915_sw_fence.c +++ b/drivers/gpu/drm/i915/i915_sw_fence.c @@ -601,10 +601,10 @@ int i915_sw_fence_await_reservation(struct i915_sw_fence *fence, for (i = 0; i < count; i++) dma_fence_put(shared[i]); kfree(shared); - } else { - excl = dma_resv_get_excl_unlocked(resv); } + excl = dma_resv_get_excl_unlocked(resv); + if (ret >= 0 && excl) { pending = i915_sw_fence_await_dma_fence(fence, excl, -- 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 ` Daniel Vetter [this message] 2021-07-06 10:12 ` [Intel-gfx] [PATCH 5/7] drm/i915: Always wait for the exclusive fence 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 ` [PATCH 6/7] drm/i915: Don't break exclusive fence ordering Daniel Vetter 2021-07-06 10:12 ` [Intel-gfx] " 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-6-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.