From: Matthew Brost <matthew.brost@intel.com>
To: dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Cc: robdclark@chromium.org, sarah.walker@imgtec.com,
ketil.johnsen@arm.com, frank.binns@imgtec.com,
Liviu.Dudau@arm.com, luben.tuikov@amd.com, lina@asahilina.net,
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 7/8] drm/sched: Submit job before starting TDR
Date: Tue, 1 Aug 2023 13:51:02 -0700 [thread overview]
Message-ID: <20230801205103.627779-8-matthew.brost@intel.com> (raw)
In-Reply-To: <20230801205103.627779-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 2e404a6542ad..9573f13f8459 100644
--- a/drivers/gpu/drm/scheduler/sched_main.c
+++ b/drivers/gpu/drm/scheduler/sched_main.c
@@ -445,7 +445,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);
}
@@ -1146,6 +1145,7 @@ static void drm_sched_main(struct work_struct *w)
fence = sched->ops->run_job(sched_job);
complete_all(&entity->entity_idle);
drm_sched_fence_scheduled(s_fence);
+ drm_sched_start_timeout_unlocked(sched);
if (!IS_ERR_OR_NULL(fence)) {
drm_sched_fence_set_parent(s_fence, fence);
--
2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Matthew Brost <matthew.brost@intel.com>
To: dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Cc: robdclark@chromium.org, thomas.hellstrom@linux.intel.com,
Matthew Brost <matthew.brost@intel.com>,
sarah.walker@imgtec.com, ketil.johnsen@arm.com,
Liviu.Dudau@arm.com, luben.tuikov@amd.com, lina@asahilina.net,
donald.robson@imgtec.com, boris.brezillon@collabora.com,
christian.koenig@amd.com, faith.ekstrand@collabora.com
Subject: [PATCH 7/8] drm/sched: Submit job before starting TDR
Date: Tue, 1 Aug 2023 13:51:02 -0700 [thread overview]
Message-ID: <20230801205103.627779-8-matthew.brost@intel.com> (raw)
In-Reply-To: <20230801205103.627779-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 2e404a6542ad..9573f13f8459 100644
--- a/drivers/gpu/drm/scheduler/sched_main.c
+++ b/drivers/gpu/drm/scheduler/sched_main.c
@@ -445,7 +445,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);
}
@@ -1146,6 +1145,7 @@ static void drm_sched_main(struct work_struct *w)
fence = sched->ops->run_job(sched_job);
complete_all(&entity->entity_idle);
drm_sched_fence_scheduled(s_fence);
+ drm_sched_start_timeout_unlocked(sched);
if (!IS_ERR_OR_NULL(fence)) {
drm_sched_fence_set_parent(s_fence, fence);
--
2.34.1
next prev parent reply other threads:[~2023-08-01 20:51 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-01 20:50 [Intel-xe] [PATCH 0/8] DRM scheduler changes for Xe Matthew Brost
2023-08-01 20:50 ` Matthew Brost
2023-08-01 20:50 ` [Intel-xe] [PATCH 1/8] drm/sched: Convert drm scheduler to use a work queue rather than kthread Matthew Brost
2023-08-01 20:50 ` Matthew Brost
2023-08-03 10:11 ` [Intel-xe] " Tvrtko Ursulin
2023-08-03 10:11 ` Tvrtko Ursulin
2023-08-03 14:43 ` [Intel-xe] " Matthew Brost
2023-08-03 14:43 ` Matthew Brost
2023-08-03 14:56 ` [Intel-xe] " Christian König
2023-08-03 14:56 ` Christian König
2023-08-03 15:19 ` [Intel-xe] " Tvrtko Ursulin
2023-08-03 15:19 ` Tvrtko Ursulin
2023-08-03 15:39 ` [Intel-xe] " Tvrtko Ursulin
2023-08-03 15:39 ` Tvrtko Ursulin
2023-08-01 20:50 ` [Intel-xe] [PATCH 2/8] drm/sched: Move schedule policy to scheduler / entity Matthew Brost
2023-08-01 20:50 ` Matthew Brost
2023-08-01 20:50 ` [Intel-xe] [PATCH 3/8] drm/sched: Add DRM_SCHED_POLICY_SINGLE_ENTITY scheduling policy Matthew Brost
2023-08-01 20:50 ` Matthew Brost
2023-08-03 8:50 ` [Intel-xe] " Christian König
2023-08-03 8:50 ` Christian König
2023-08-01 20:50 ` [Intel-xe] [PATCH 4/8] drm/sched: Add generic scheduler message interface Matthew Brost
2023-08-01 20:50 ` Matthew Brost
2023-08-03 8:53 ` [Intel-xe] " Christian König
2023-08-03 8:53 ` Christian König
2023-08-03 8:58 ` [Intel-xe] " Daniel Vetter
2023-08-03 8:58 ` Daniel Vetter
2023-08-03 9:35 ` [Intel-xe] " Christian König
2023-08-03 9:35 ` Christian König
2023-08-04 8:50 ` [Intel-xe] " Daniel Vetter
2023-08-04 8:50 ` Daniel Vetter
2023-08-04 14:13 ` [Intel-xe] " Matthew Brost
2023-08-04 14:13 ` Matthew Brost
2023-08-07 15:46 ` [Intel-xe] " Christian König
2023-08-07 15:46 ` Christian König
2023-08-08 14:06 ` [Intel-xe] " Matthew Brost
2023-08-08 14:06 ` Matthew Brost
2023-08-08 14:14 ` [Intel-xe] " Christian König
2023-08-08 14:14 ` Christian König
2023-08-09 14:36 ` [Intel-xe] " Matthew Brost
2023-08-09 14:36 ` Matthew Brost
2023-08-01 20:51 ` [Intel-xe] [PATCH 5/8] drm/sched: Add drm_sched_start_timeout_unlocked helper Matthew Brost
2023-08-01 20:51 ` Matthew Brost
2023-08-01 20:51 ` [Intel-xe] [PATCH 6/8] drm/sched: Start run wq before TDR in drm_sched_start Matthew Brost
2023-08-01 20:51 ` Matthew Brost
2023-08-01 20:51 ` Matthew Brost [this message]
2023-08-01 20:51 ` [PATCH 7/8] drm/sched: Submit job before starting TDR Matthew Brost
2023-08-01 20:51 ` [Intel-xe] [PATCH 8/8] drm/sched: Add helper to set TDR timeout Matthew Brost
2023-08-01 20:51 ` Matthew Brost
2023-08-01 20:53 ` [Intel-xe] ✗ CI.Patch_applied: failure for DRM scheduler changes for Xe 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=20230801205103.627779-8-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=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=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 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.