From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Cc: "Jack Zhang" <Jack.Zhang1@amd.com>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Intel Graphics Development" <intel-gfx@lists.freedesktop.org>, "Luben Tuikov" <luben.tuikov@amd.com>, "Alex Deucher" <alexander.deucher@amd.com>, "Daniel Vetter" <daniel.vetter@intel.com>, "Christian König" <christian.koenig@amd.com> Subject: [PATCH v4 12/18] drm/sched: Don't store self-dependencies Date: Mon, 12 Jul 2021 19:53:46 +0200 [thread overview] Message-ID: <20210712175352.802687-13-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20210712175352.802687-1-daniel.vetter@ffwll.ch> This is essentially part of drm_sched_dependency_optimized(), which only amdgpu seems to make use of. Use it a bit more. This would mean that as-is amdgpu can't use the dependency helpers, at least not with the current approach amdgpu has for deciding whether a vm_flush is needed. Since amdgpu also has very special rules around implicit fencing it can't use those helpers either, and adding a drm_sched_job_await_fence_always or similar for amdgpu wouldn't be too onerous. That way the special case handling for amdgpu sticks even more out and we have higher chances that reviewers that go across all drivers wont miss it. Reviewed-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: "Christian König" <christian.koenig@amd.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Luben Tuikov <luben.tuikov@amd.com> Cc: Andrey Grodzovsky <andrey.grodzovsky@amd.com> Cc: Alex Deucher <alexander.deucher@amd.com> Cc: Jack Zhang <Jack.Zhang1@amd.com> --- drivers/gpu/drm/scheduler/sched_main.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index 84c30badb78e..fd52db906b90 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -660,6 +660,13 @@ int drm_sched_job_await_fence(struct drm_sched_job *job, if (!fence) return 0; + /* if it's a fence from us it's guaranteed to be earlier */ + if (fence->context == job->entity->fence_context || + fence->context == job->entity->fence_context + 1) { + dma_fence_put(fence); + return 0; + } + /* Deduplicate if we already depend on a fence from the same context. * This lets the size of the array of deps scale with the number of * engines involved, rather than the number of BOs. -- 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: "Andrey Grodzovsky" <andrey.grodzovsky@amd.com>, "Jack Zhang" <Jack.Zhang1@amd.com>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Intel Graphics Development" <intel-gfx@lists.freedesktop.org>, "Luben Tuikov" <luben.tuikov@amd.com>, "Alex Deucher" <alexander.deucher@amd.com>, "Daniel Vetter" <daniel.vetter@intel.com>, "Christian König" <christian.koenig@amd.com>, "Lucas Stach" <l.stach@pengutronix.de> Subject: [Intel-gfx] [PATCH v4 12/18] drm/sched: Don't store self-dependencies Date: Mon, 12 Jul 2021 19:53:46 +0200 [thread overview] Message-ID: <20210712175352.802687-13-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20210712175352.802687-1-daniel.vetter@ffwll.ch> This is essentially part of drm_sched_dependency_optimized(), which only amdgpu seems to make use of. Use it a bit more. This would mean that as-is amdgpu can't use the dependency helpers, at least not with the current approach amdgpu has for deciding whether a vm_flush is needed. Since amdgpu also has very special rules around implicit fencing it can't use those helpers either, and adding a drm_sched_job_await_fence_always or similar for amdgpu wouldn't be too onerous. That way the special case handling for amdgpu sticks even more out and we have higher chances that reviewers that go across all drivers wont miss it. Reviewed-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: "Christian König" <christian.koenig@amd.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Luben Tuikov <luben.tuikov@amd.com> Cc: Andrey Grodzovsky <andrey.grodzovsky@amd.com> Cc: Alex Deucher <alexander.deucher@amd.com> Cc: Jack Zhang <Jack.Zhang1@amd.com> --- drivers/gpu/drm/scheduler/sched_main.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index 84c30badb78e..fd52db906b90 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -660,6 +660,13 @@ int drm_sched_job_await_fence(struct drm_sched_job *job, if (!fence) return 0; + /* if it's a fence from us it's guaranteed to be earlier */ + if (fence->context == job->entity->fence_context || + fence->context == job->entity->fence_context + 1) { + dma_fence_put(fence); + return 0; + } + /* Deduplicate if we already depend on a fence from the same context. * This lets the size of the array of deps scale with the number of * engines involved, rather than the number of BOs. -- 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-12 20:02 UTC|newest] Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-12 17:53 [PATCH v4 00/18] drm/sched dependency tracking and dma-resv fixes Daniel Vetter 2021-07-12 17:53 ` [Intel-gfx] " Daniel Vetter 2021-07-12 17:53 ` [PATCH v4 01/18] drm/sched: Split drm_sched_job_init Daniel Vetter 2021-07-12 17:53 ` [Intel-gfx] " Daniel Vetter 2021-07-12 17:53 ` Daniel Vetter 2021-07-12 20:22 ` Emma Anholt 2021-07-12 20:22 ` [Intel-gfx] " Emma Anholt 2021-07-12 20:22 ` Emma Anholt 2021-07-13 6:40 ` Christian König 2021-07-13 6:40 ` [Intel-gfx] " Christian König 2021-07-13 6:40 ` Christian König 2021-07-13 6:53 ` Daniel Vetter 2021-07-13 6:53 ` [Intel-gfx] " Daniel Vetter 2021-07-13 6:53 ` Daniel Vetter 2021-07-12 17:53 ` [PATCH v4 02/18] drm/sched: Barriers are needed for entity->last_scheduled Daniel Vetter 2021-07-12 17:53 ` [Intel-gfx] " Daniel Vetter 2021-07-13 6:35 ` Christian König 2021-07-13 6:35 ` [Intel-gfx] " Christian König 2021-07-13 6:50 ` Daniel Vetter 2021-07-13 6:50 ` [Intel-gfx] " Daniel Vetter 2021-07-13 7:25 ` Christian König 2021-07-13 7:25 ` [Intel-gfx] " Christian König 2021-07-13 9:10 ` Daniel Vetter 2021-07-13 9:10 ` [Intel-gfx] " Daniel Vetter 2021-07-13 11:20 ` Christian König 2021-07-13 11:20 ` [Intel-gfx] " Christian König 2021-07-13 16:11 ` Andrey Grodzovsky 2021-07-13 16:11 ` [Intel-gfx] " Andrey Grodzovsky 2021-07-13 16:45 ` Daniel Vetter 2021-07-13 16:45 ` [Intel-gfx] " Daniel Vetter 2021-07-14 22:12 ` Andrey Grodzovsky 2021-07-14 22:12 ` [Intel-gfx] " Andrey Grodzovsky 2021-07-15 10:16 ` Daniel Vetter 2021-07-15 10:16 ` [Intel-gfx] " Daniel Vetter 2021-07-12 17:53 ` [PATCH v4 03/18] drm/sched: Add dependency tracking Daniel Vetter 2021-07-12 17:53 ` [Intel-gfx] " Daniel Vetter 2021-07-12 17:53 ` Daniel Vetter 2021-07-27 11:09 ` Daniel Vetter 2021-07-27 11:09 ` [Intel-gfx] " Daniel Vetter 2021-07-27 11:09 ` Daniel Vetter 2021-07-28 11:28 ` [Linaro-mm-sig] " Christian König 2021-07-28 11:28 ` [Intel-gfx] " Christian König 2021-07-28 11:28 ` Christian König 2021-07-28 12:09 ` Daniel Vetter 2021-07-28 12:09 ` [Intel-gfx] " Daniel Vetter 2021-07-28 12:09 ` Daniel Vetter 2021-07-28 12:46 ` Christian König 2021-07-28 12:46 ` [Intel-gfx] " Christian König 2021-07-28 12:46 ` Christian König 2021-07-28 15:20 ` Melissa Wen 2021-07-28 15:20 ` [Intel-gfx] " Melissa Wen 2021-07-28 15:20 ` Melissa Wen 2021-07-12 17:53 ` [PATCH v4 04/18] drm/sched: drop entity parameter from drm_sched_push_job Daniel Vetter 2021-07-12 17:53 ` [Intel-gfx] " Daniel Vetter 2021-07-12 17:53 ` Daniel Vetter 2021-07-12 17:53 ` [PATCH v4 05/18] drm/sched: improve docs around drm_sched_entity Daniel Vetter 2021-07-12 17:53 ` [Intel-gfx] " Daniel Vetter 2021-07-12 17:53 ` [PATCH v4 06/18] drm/panfrost: use scheduler dependency tracking Daniel Vetter 2021-07-12 17:53 ` [Intel-gfx] " Daniel Vetter 2021-07-12 17:53 ` Daniel Vetter 2021-07-12 17:53 ` [PATCH v4 07/18] drm/lima: " Daniel Vetter 2021-07-12 17:53 ` [Intel-gfx] " Daniel Vetter 2021-07-12 17:53 ` Daniel Vetter 2021-07-12 17:53 ` [PATCH v4 08/18] drm/v3d: Move drm_sched_job_init to v3d_job_init Daniel Vetter 2021-07-12 17:53 ` [Intel-gfx] " Daniel Vetter 2021-07-14 9:34 ` Melissa Wen 2021-07-14 9:34 ` [Intel-gfx] " Melissa Wen 2021-07-12 17:53 ` [PATCH v4 09/18] drm/v3d: Use scheduler dependency handling Daniel Vetter 2021-07-12 17:53 ` [Intel-gfx] " Daniel Vetter 2021-07-14 9:37 ` Melissa Wen 2021-07-14 9:37 ` [Intel-gfx] " Melissa Wen 2021-07-12 17:53 ` [PATCH v4 10/18] drm/etnaviv: " Daniel Vetter 2021-07-12 17:53 ` [Intel-gfx] " Daniel Vetter 2021-07-12 17:53 ` Daniel Vetter 2021-07-12 17:53 ` [PATCH v4 11/18] drm/gem: Delete gem array fencing helpers Daniel Vetter 2021-07-12 17:53 ` [Intel-gfx] " Daniel Vetter 2021-07-12 17:53 ` Daniel Vetter 2021-07-12 17:53 ` Daniel Vetter [this message] 2021-07-12 17:53 ` [Intel-gfx] [PATCH v4 12/18] drm/sched: Don't store self-dependencies Daniel Vetter 2021-07-12 17:53 ` [PATCH v4 13/18] drm/sched: Check locking in drm_sched_job_await_implicit Daniel Vetter 2021-07-12 17:53 ` [Intel-gfx] " Daniel Vetter 2021-07-12 17:53 ` [PATCH v4 14/18] drm/msm: Don't break exclusive fence ordering Daniel Vetter 2021-07-12 17:53 ` [Intel-gfx] " Daniel Vetter 2021-07-12 17:53 ` Daniel Vetter 2021-07-13 16:55 ` Rob Clark 2021-07-13 16:55 ` [Intel-gfx] " Rob Clark 2021-07-13 16:55 ` Rob Clark 2021-07-13 16:58 ` Daniel Vetter 2021-07-13 16:58 ` [Intel-gfx] " Daniel Vetter 2021-07-13 16:58 ` Daniel Vetter 2021-07-13 17:46 ` Rob Clark 2021-07-13 17:46 ` [Intel-gfx] " Rob Clark 2021-07-13 17:46 ` Rob Clark 2021-07-13 17:45 ` Daniel Vetter 2021-07-13 17:45 ` [Intel-gfx] " Daniel Vetter 2021-07-13 17:45 ` Daniel Vetter 2021-07-12 17:53 ` [PATCH v4 15/18] drm/etnaviv: " Daniel Vetter 2021-07-12 17:53 ` [Intel-gfx] " Daniel Vetter 2021-07-12 17:53 ` [PATCH v4 16/18] drm/i915: delete exclude argument from i915_sw_fence_await_reservation Daniel Vetter 2021-07-12 17:53 ` [Intel-gfx] " Daniel Vetter 2021-07-12 17:53 ` [PATCH v4 17/18] drm/i915: Don't break exclusive fence ordering Daniel Vetter 2021-07-12 17:53 ` [Intel-gfx] " Daniel Vetter 2021-07-12 17:53 ` [PATCH v4 18/18] dma-resv: Give the docs a do-over Daniel Vetter 2021-07-12 17:53 ` [Intel-gfx] " Daniel Vetter 2021-07-12 17:53 ` Daniel Vetter 2021-07-12 20:47 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/sched dependency tracking and dma-resv fixes (rev3) Patchwork 2021-07-12 21:13 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2021-07-12 23:43 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork 2021-07-27 11:51 ` [PATCH v4 00/18] drm/sched dependency tracking and dma-resv fixes Boris Brezillon 2021-07-27 11:51 ` [Intel-gfx] " Boris Brezillon 2021-07-27 14:47 ` Melissa Wen 2021-07-27 14:47 ` [Intel-gfx] " Melissa Wen
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=20210712175352.802687-13-daniel.vetter@ffwll.ch \ --to=daniel.vetter@ffwll.ch \ --cc=Jack.Zhang1@amd.com \ --cc=alexander.deucher@amd.com \ --cc=christian.koenig@amd.com \ --cc=daniel.vetter@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=luben.tuikov@amd.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.