From: Rob Clark <robdclark@gmail.com>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: "DRI Development" <dri-devel@lists.freedesktop.org>,
"Intel Graphics Development" <intel-gfx@lists.freedesktop.org>,
"Rob Clark" <robdclark@chromium.org>,
"Sean Paul" <sean@poorly.run>,
"Sumit Semwal" <sumit.semwal@linaro.org>,
"Christian König" <christian.koenig@amd.com>,
linux-arm-msm <linux-arm-msm@vger.kernel.org>,
freedreno <freedreno@lists.freedesktop.org>,
"open list:DMA BUFFER SHARING FRAMEWORK"
<linux-media@vger.kernel.org>,
"moderated list:DMA BUFFER SHARING FRAMEWORK"
<linaro-mm-sig@lists.linaro.org>,
"Daniel Vetter" <daniel.vetter@intel.com>
Subject: Re: [Intel-gfx] [PATCH] drm/msm: Improve drm/sched point of no return rules
Date: Thu, 26 Aug 2021 08:38:50 -0700 [thread overview]
Message-ID: <CAF6AEGvVjrii3-22ocsuej8Hw-2OLG8Zok-LsUceh4Aqu=45-g@mail.gmail.com> (raw)
In-Reply-To: <20210826093334.1117944-1-daniel.vetter@ffwll.ch>
On Thu, Aug 26, 2021 at 2:33 AM Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>
> Originally drm_sched_job_init was the point of no return, after which
> drivers really should submit a job. I've split that up, which allows
> us to fix this issue pretty easily.
>
> Only thing we have to take care of is to not skip to error paths after
> that. Other drivers do this the same for out-fence and similar things.
>
> v2: It's not really a bugfix, just an improvement, since all
> drm_sched_job_arm does is reserve the fence number. And gaps should be
> fine, as long as the drm_sched_job doesn't escape anywhere at all.
>
> For robustness it's still better to align with other drivers here and
> not bail out after job_arm().
>
> v3: I misplaced drm_sched_job_arm by _one_ line! Thanks to Rob for
> testing and debug help.
>
> Cc: Rob Clark <robdclark@chromium.org>
> Cc: Rob Clark <robdclark@gmail.com>
> Cc: Sean Paul <sean@poorly.run>
> Cc: Sumit Semwal <sumit.semwal@linaro.org>
> Cc: "Christian König" <christian.koenig@amd.com>
> Cc: linux-arm-msm@vger.kernel.org
> Cc: dri-devel@lists.freedesktop.org
> Cc: freedreno@lists.freedesktop.org
> Cc: linux-media@vger.kernel.org
> Cc: linaro-mm-sig@lists.linaro.org
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
t-b && r-b
BR,
-R
> ---
> drivers/gpu/drm/msm/msm_gem_submit.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
> index 4d1c4d5f6a2a..71b8c8f752a3 100644
> --- a/drivers/gpu/drm/msm/msm_gem_submit.c
> +++ b/drivers/gpu/drm/msm/msm_gem_submit.c
> @@ -52,8 +52,6 @@ static struct msm_gem_submit *submit_create(struct drm_device *dev,
> return ERR_PTR(ret);
> }
>
> - drm_sched_job_arm(&job->base);
> -
> xa_init_flags(&submit->deps, XA_FLAGS_ALLOC);
>
> kref_init(&submit->ref);
> @@ -880,6 +878,8 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
>
> submit->nr_cmds = i;
>
> + drm_sched_job_arm(&submit->base);
> +
> submit->user_fence = dma_fence_get(&submit->base.s_fence->finished);
>
> /*
> @@ -891,17 +891,16 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
> if (submit->fence_id < 0) {
> ret = submit->fence_id = 0;
> submit->fence_id = 0;
> - goto out;
> }
>
> - if (args->flags & MSM_SUBMIT_FENCE_FD_OUT) {
> + if (ret == 0 && args->flags & MSM_SUBMIT_FENCE_FD_OUT) {
> struct sync_file *sync_file = sync_file_create(submit->user_fence);
> if (!sync_file) {
> ret = -ENOMEM;
> - goto out;
> + } else {
> + fd_install(out_fence_fd, sync_file->file);
> + args->fence_fd = out_fence_fd;
> }
> - fd_install(out_fence_fd, sync_file->file);
> - args->fence_fd = out_fence_fd;
> }
>
> submit_attach_object_fences(submit);
> --
> 2.32.0
>
next prev parent reply other threads:[~2021-08-26 15:34 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-05 10:46 [Intel-gfx] [PATCH v5 00/20] drm/sched dependency handling and implicit sync fixes Daniel Vetter
2021-08-05 10:46 ` [Intel-gfx] [PATCH v5 01/20] drm/sched: Split drm_sched_job_init Daniel Vetter
2021-08-05 13:43 ` Christian König
2021-08-05 14:07 ` Daniel Vetter
2021-08-05 14:47 ` Christian König
2021-08-05 15:07 ` Daniel Vetter
2021-08-17 8:49 ` [Intel-gfx] [PATCH] " Daniel Vetter
2021-08-05 10:46 ` [Intel-gfx] [PATCH v5 02/20] drm/msm: Fix drm/sched point of no return rules Daniel Vetter
2021-08-05 23:02 ` Rob Clark
2021-08-06 16:41 ` Daniel Vetter
2021-08-06 17:19 ` Rob Clark
2021-08-06 18:41 ` Daniel Vetter
2021-08-06 19:01 ` Rob Clark
2021-08-06 19:10 ` Daniel Vetter
2021-08-06 19:59 ` Rob Clark
2021-08-17 8:53 ` [Intel-gfx] [PATCH] drm/msm: Improve " Daniel Vetter
2021-08-26 9:33 ` Daniel Vetter
2021-08-26 15:38 ` Rob Clark [this message]
2021-08-05 10:46 ` [Intel-gfx] [PATCH v5 03/20] drm/sched: Barriers are needed for entity->last_scheduled Daniel Vetter
2021-08-05 13:45 ` Christian König
2021-08-05 10:46 ` [Intel-gfx] [PATCH v5 04/20] drm/sched: Add dependency tracking Daniel Vetter
2021-08-05 13:47 ` Christian König
2021-08-05 10:46 ` [Intel-gfx] [PATCH v5 05/20] drm/sched: drop entity parameter from drm_sched_push_job Daniel Vetter
2021-08-05 13:48 ` Christian König
2021-08-05 10:46 ` [Intel-gfx] [PATCH v5 06/20] drm/sched: improve docs around drm_sched_entity Daniel Vetter
2021-08-05 10:46 ` [Intel-gfx] [PATCH v5 07/20] drm/panfrost: use scheduler dependency tracking Daniel Vetter
2021-08-05 15:10 ` Alyssa Rosenzweig
2021-08-05 10:46 ` [Intel-gfx] [PATCH v5 08/20] drm/lima: " Daniel Vetter
2021-08-12 19:28 ` Daniel Vetter
2021-08-14 2:45 ` Qiang Yu
2021-08-05 10:46 ` [Intel-gfx] [PATCH v5 09/20] drm/v3d: Move drm_sched_job_init to v3d_job_init Daniel Vetter
2021-08-05 10:46 ` [Intel-gfx] [PATCH v5 10/20] drm/v3d: Use scheduler dependency handling Daniel Vetter
2021-08-05 10:46 ` [Intel-gfx] [PATCH v5 11/20] drm/etnaviv: " Daniel Vetter
2021-08-12 19:28 ` Daniel Vetter
2021-08-05 10:46 ` [Intel-gfx] [PATCH v5 12/20] drm/msm: " Daniel Vetter
2021-08-12 19:29 ` Daniel Vetter
2021-08-26 16:12 ` Rob Clark
2021-08-30 9:01 ` Daniel Vetter
2021-08-05 10:46 ` [Intel-gfx] [PATCH v5 13/20] drm/gem: Delete gem array fencing helpers Daniel Vetter
2021-08-12 19:29 ` Daniel Vetter
2021-08-05 10:46 ` [Intel-gfx] [PATCH v5 14/20] drm/sched: Don't store self-dependencies Daniel Vetter
2021-08-05 13:18 ` Christian König
2021-08-05 13:25 ` Daniel Vetter
2021-08-05 13:57 ` Christian König
2021-08-05 15:06 ` Daniel Vetter
2021-08-05 10:47 ` [Intel-gfx] [PATCH v5 15/20] drm/sched: Check locking in drm_sched_job_await_implicit Daniel Vetter
2021-08-05 13:19 ` Christian König
2021-08-05 13:27 ` Daniel Vetter
2021-08-05 10:47 ` [Intel-gfx] [PATCH v5 16/20] drm/msm: Don't break exclusive fence ordering Daniel Vetter
2021-08-26 16:16 ` Rob Clark
2021-08-30 9:02 ` Daniel Vetter
2021-08-05 10:47 ` [Intel-gfx] [PATCH v5 17/20] drm/etnaviv: " Daniel Vetter
2021-08-05 10:47 ` [Intel-gfx] [PATCH v5 18/20] drm/i915: delete exclude argument from i915_sw_fence_await_reservation Daniel Vetter
2021-08-05 10:47 ` [Intel-gfx] [PATCH v5 19/20] drm/i915: Don't break exclusive fence ordering Daniel Vetter
2021-08-05 10:47 ` [Intel-gfx] [PATCH v5 20/20] dma-resv: Give the docs a do-over Daniel Vetter
2021-08-30 19:38 ` Daniel Vetter
2021-08-05 13:58 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/sched dependency handling and implicit sync fixes Patchwork
2021-08-05 14:29 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2021-08-06 19:14 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/sched dependency handling and implicit sync fixes (rev2) Patchwork
2021-08-17 16:27 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/sched dependency handling and implicit sync fixes (rev4) Patchwork
2021-08-17 16:57 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-08-17 18:15 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2021-08-26 13:17 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/sched dependency handling and implicit sync fixes (rev5) Patchwork
2021-08-26 13:48 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-08-26 21:46 ` [Intel-gfx] ✗ Fi.CI.IGT: 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='CAF6AEGvVjrii3-22ocsuej8Hw-2OLG8Zok-LsUceh4Aqu=45-g@mail.gmail.com' \
--to=robdclark@gmail.com \
--cc=christian.koenig@amd.com \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=robdclark@chromium.org \
--cc=sean@poorly.run \
--cc=sumit.semwal@linaro.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).