From: Matthew Brost <matthew.brost@intel.com>
To: dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Cc: robdclark@chromium.org, lina@asahilina.net,
sarah.walker@imgtec.com, ketil.johnsen@arm.com,
Liviu.Dudau@arm.com, mcanal@igalia.com, frank.binns@imgtec.com,
luben.tuikov@amd.com, dakr@redhat.com, donald.robson@imgtec.com,
daniel@ffwll.ch, boris.brezillon@collabora.com,
airlied@gmail.com, christian.koenig@amd.com,
faith.ekstrand@collabora.com
Subject: [Intel-xe] [PATCH v4 08/10] drm/sched: Submit job before starting TDR
Date: Mon, 18 Sep 2023 22:01:53 -0700 [thread overview]
Message-ID: <20230919050155.2647172-9-matthew.brost@intel.com> (raw)
In-Reply-To: <20230919050155.2647172-1-matthew.brost@intel.com>
If the TDR is set to a value, it can fire before a job is submitted in
drm_sched_main. The job should be always be submitted before the TDR
fires, fix this ordering.
v2:
- Add to pending list before run_job, start TDR after (Luben, Boris)
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
---
drivers/gpu/drm/scheduler/sched_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c
index a5cc9b6c2faa..e8a3e6033f66 100644
--- a/drivers/gpu/drm/scheduler/sched_main.c
+++ b/drivers/gpu/drm/scheduler/sched_main.c
@@ -517,7 +517,6 @@ static void drm_sched_job_begin(struct drm_sched_job *s_job)
spin_lock(&sched->job_list_lock);
list_add_tail(&s_job->list, &sched->pending_list);
- drm_sched_start_timeout(sched);
spin_unlock(&sched->job_list_lock);
}
@@ -1138,6 +1137,7 @@ static void drm_sched_run_job_work(struct work_struct *w)
fence = sched->ops->run_job(sched_job);
complete_all(&entity->entity_idle);
drm_sched_fence_scheduled(s_fence, fence);
+ drm_sched_start_timeout_unlocked(sched);
if (!IS_ERR_OR_NULL(fence)) {
/* Drop for original kref_init of the fence */
--
2.34.1
next prev parent reply other threads:[~2023-09-19 5:02 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-19 5:01 [Intel-xe] [PATCH v4 00/10] DRM scheduler changes for Xe Matthew Brost
2023-09-19 5:01 ` [Intel-xe] [PATCH v4 01/10] drm/sched: Add drm_sched_submit_* helpers Matthew Brost
2023-09-19 5:58 ` Christian König
2023-09-21 3:41 ` Luben Tuikov
2023-09-27 1:07 ` Luben Tuikov
2023-09-19 5:01 ` [Intel-xe] [PATCH v4 02/10] drm/sched: Convert drm scheduler to use a work queue rather than kthread Matthew Brost
2023-09-27 3:32 ` Luben Tuikov
2023-10-05 3:33 ` Matthew Brost
2023-10-05 4:13 ` Luben Tuikov
2023-10-05 15:19 ` Matthew Brost
2023-10-06 7:59 ` Tvrtko Ursulin
2023-10-06 15:14 ` Matthew Brost
2023-10-06 23:43 ` Matthew Brost
2023-10-09 8:35 ` Tvrtko Ursulin
2023-10-11 23:19 ` Luben Tuikov
2023-10-11 23:11 ` Luben Tuikov
2023-10-11 23:10 ` Luben Tuikov
2023-09-19 5:01 ` [Intel-xe] [PATCH v4 03/10] drm/sched: Move schedule policy to scheduler Matthew Brost
2023-09-24 1:18 ` kernel test robot
2023-09-27 12:13 ` Luben Tuikov
2023-09-19 5:01 ` [Intel-xe] [PATCH v4 04/10] drm/sched: Add DRM_SCHED_POLICY_SINGLE_ENTITY scheduling policy Matthew Brost
2023-09-27 14:36 ` Luben Tuikov
2023-10-05 4:02 ` Matthew Brost
2023-09-19 5:01 ` [Intel-xe] [PATCH v4 05/10] drm/sched: Split free_job into own work item Matthew Brost
2023-09-28 16:14 ` Luben Tuikov
2023-10-05 4:06 ` Matthew Brost
2023-10-11 23:29 ` Luben Tuikov
2023-09-19 5:01 ` [Intel-xe] [PATCH v4 06/10] drm/sched: Add drm_sched_start_timeout_unlocked helper Matthew Brost
2023-09-29 21:23 ` Luben Tuikov
2023-09-19 5:01 ` [Intel-xe] [PATCH v4 07/10] drm/sched: Start submission before TDR in drm_sched_start Matthew Brost
2023-09-29 21:53 ` Luben Tuikov
2023-09-30 19:48 ` Luben Tuikov
2023-10-05 3:11 ` Matthew Brost
2023-10-05 3:18 ` Luben Tuikov
2023-09-19 5:01 ` Matthew Brost [this message]
2023-09-29 21:58 ` [Intel-xe] [PATCH v4 08/10] drm/sched: Submit job before starting TDR Luben Tuikov
2023-10-05 4:11 ` Matthew Brost
2023-09-19 5:01 ` [Intel-xe] [PATCH v4 09/10] drm/sched: Add helper to queue TDR immediately for current and future jobs Matthew Brost
2023-09-29 22:44 ` Luben Tuikov
2023-10-05 3:22 ` Matthew Brost
2023-09-19 5:01 ` [Intel-xe] [PATCH v4 10/10] drm/sched: Update maintainers of GPU scheduler Matthew Brost
2023-09-19 5:32 ` [Intel-xe] ✗ CI.Patch_applied: failure for DRM scheduler changes for Xe (rev6) Patchwork
2023-09-19 11:44 ` [Intel-xe] [PATCH v4 00/10] DRM scheduler changes for Xe Danilo Krummrich
2023-09-25 21:47 ` Danilo Krummrich
2023-09-27 7:33 ` Boris Brezillon
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=20230919050155.2647172-9-matthew.brost@intel.com \
--to=matthew.brost@intel.com \
--cc=Liviu.Dudau@arm.com \
--cc=airlied@gmail.com \
--cc=boris.brezillon@collabora.com \
--cc=christian.koenig@amd.com \
--cc=dakr@redhat.com \
--cc=daniel@ffwll.ch \
--cc=donald.robson@imgtec.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=faith.ekstrand@collabora.com \
--cc=frank.binns@imgtec.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=ketil.johnsen@arm.com \
--cc=lina@asahilina.net \
--cc=luben.tuikov@amd.com \
--cc=mcanal@igalia.com \
--cc=robdclark@chromium.org \
--cc=sarah.walker@imgtec.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: 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