From: Bert Karwatzki <spasswolf@web.de>
To: ltuikov89@gmail.com
Cc: robdclark@chromium.org, sarah.walker@imgtec.com,
tvrtko.ursulin@linux.intel.com, ketil.johnsen@arm.com,
lina@asahilina.net, mcanal@igalia.com, Liviu.Dudau@arm.com,
dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org,
boris.brezillon@collabora.com, dakr@redhat.com,
donald.robson@imgtec.com, christian.koenig@amd.com,
faith.ekstrand@collabora.com, Bert Karwatzki <spasswolf@web.de>
Subject: [Intel-xe] [PATCH] Revert "drm/sched: Qualify drm_sched_wakeup() by drm_sched_entity_is_ready()"
Date: Mon, 27 Nov 2023 14:30:15 +0100 [thread overview]
Message-ID: <20231127133015.104165-1-spasswolf@web.de> (raw)
In-Reply-To: <6273fadf-267a-4965-82ab-89c5b3f28cf2@gmail.com>
Commit f3123c25 (in combination with the use of work queues by the gpu
scheduler) leads to random lock ups of the GUI [1,2].
This is not a complete revert of commit f3123c25 as drm_sched_wakeup
still needs its entity argument to pass it to drm_sched_can_queue.
[1] https://gitlab.freedesktop.org/drm/amd/-/issues/2994
[2] https://lists.freedesktop.org/archives/dri-devel/2023-November/431606.html
This reverts commit f3123c2590005c5ff631653d31428e40cd10c618.
---
drivers/gpu/drm/scheduler/sched_main.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c
index 682aebe96db7..550492a7a031 100644
--- a/drivers/gpu/drm/scheduler/sched_main.c
+++ b/drivers/gpu/drm/scheduler/sched_main.c
@@ -1029,9 +1029,8 @@ EXPORT_SYMBOL(drm_sched_job_cleanup);
void drm_sched_wakeup(struct drm_gpu_scheduler *sched,
struct drm_sched_entity *entity)
{
- if (drm_sched_entity_is_ready(entity))
- if (drm_sched_can_queue(sched, entity))
- drm_sched_run_job_queue(sched);
+ if (drm_sched_can_queue(sched, entity))
+ drm_sched_run_job_queue(sched);
}
/**
--
2.43.0
WARNING: multiple messages have this Message-ID (diff)
From: Bert Karwatzki <spasswolf@web.de>
To: ltuikov89@gmail.com
Cc: matthew.brost@intel.com, robdclark@chromium.org,
sarah.walker@imgtec.com, tvrtko.ursulin@linux.intel.com,
ketil.johnsen@arm.com, lina@asahilina.net, mcanal@igalia.com,
Liviu.Dudau@arm.com, dri-devel@lists.freedesktop.org,
intel-xe@lists.freedesktop.org, boris.brezillon@collabora.com,
dakr@redhat.com, donald.robson@imgtec.com,
christian.koenig@amd.com, faith.ekstrand@collabora.com,
Bert Karwatzki <spasswolf@web.de>
Subject: [PATCH] Revert "drm/sched: Qualify drm_sched_wakeup() by drm_sched_entity_is_ready()"
Date: Mon, 27 Nov 2023 14:30:15 +0100 [thread overview]
Message-ID: <20231127133015.104165-1-spasswolf@web.de> (raw)
In-Reply-To: <6273fadf-267a-4965-82ab-89c5b3f28cf2@gmail.com>
Commit f3123c25 (in combination with the use of work queues by the gpu
scheduler) leads to random lock ups of the GUI [1,2].
This is not a complete revert of commit f3123c25 as drm_sched_wakeup
still needs its entity argument to pass it to drm_sched_can_queue.
[1] https://gitlab.freedesktop.org/drm/amd/-/issues/2994
[2] https://lists.freedesktop.org/archives/dri-devel/2023-November/431606.html
This reverts commit f3123c2590005c5ff631653d31428e40cd10c618.
---
drivers/gpu/drm/scheduler/sched_main.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c
index 682aebe96db7..550492a7a031 100644
--- a/drivers/gpu/drm/scheduler/sched_main.c
+++ b/drivers/gpu/drm/scheduler/sched_main.c
@@ -1029,9 +1029,8 @@ EXPORT_SYMBOL(drm_sched_job_cleanup);
void drm_sched_wakeup(struct drm_gpu_scheduler *sched,
struct drm_sched_entity *entity)
{
- if (drm_sched_entity_is_ready(entity))
- if (drm_sched_can_queue(sched, entity))
- drm_sched_run_job_queue(sched);
+ if (drm_sched_can_queue(sched, entity))
+ drm_sched_run_job_queue(sched);
}
/**
--
2.43.0
next prev parent reply other threads:[~2023-11-27 14:33 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-31 3:24 [Intel-xe] [PATCH v8 0/5] DRM scheduler changes for Xe Matthew Brost
2023-10-31 3:24 ` Matthew Brost
2023-10-31 3:24 ` [Intel-xe] [PATCH v8 1/5] drm/sched: Add drm_sched_wqueue_* helpers Matthew Brost
2023-10-31 3:24 ` Matthew Brost
2023-10-31 3:24 ` [Intel-xe] [PATCH v8 2/5] drm/sched: Convert drm scheduler to use a work queue rather than kthread Matthew Brost
2023-10-31 3:24 ` Matthew Brost
2023-10-31 3:24 ` [Intel-xe] [PATCH v8 3/5] drm/sched: Split free_job into own work item Matthew Brost
2023-10-31 3:24 ` Matthew Brost
2023-11-01 22:13 ` [Intel-xe] " Luben Tuikov
2023-11-01 22:13 ` Luben Tuikov
2023-11-02 11:13 ` [Intel-xe] " Tvrtko Ursulin
2023-11-02 11:13 ` Tvrtko Ursulin
2023-11-02 22:46 ` [Intel-xe] [PATCH] drm/sched: Eliminate drm_sched_run_job_queue_if_ready() Luben Tuikov
2023-11-02 22:46 ` Luben Tuikov
2023-11-03 10:39 ` [Intel-xe] " Tvrtko Ursulin
2023-11-03 10:39 ` Tvrtko Ursulin
2023-11-04 0:25 ` [Intel-xe] " Luben Tuikov
2023-11-04 0:25 ` Luben Tuikov
2023-11-06 12:54 ` [Intel-xe] " Tvrtko Ursulin
2023-11-06 12:54 ` Tvrtko Ursulin
2023-11-03 15:13 ` [Intel-xe] " Matthew Brost
2023-11-03 15:13 ` Matthew Brost
2023-11-04 0:24 ` [Intel-xe] " Luben Tuikov
2023-11-04 0:24 ` Luben Tuikov
2023-11-02 22:58 ` [Intel-xe] [PATCH v8 3/5] drm/sched: Split free_job into own work item Luben Tuikov
2023-11-02 22:58 ` Luben Tuikov
2023-11-07 4:10 ` [Intel-xe] [PATCH] drm/sched: Don't disturb the entity when in RR-mode scheduling Luben Tuikov
2023-11-07 4:10 ` Luben Tuikov
2023-11-07 11:48 ` [Intel-xe] " Matthew Brost
2023-11-07 11:48 ` Matthew Brost
2023-11-08 3:28 ` [Intel-xe] " Luben Tuikov
2023-11-08 3:28 ` Luben Tuikov
2023-11-07 17:53 ` [Intel-xe] " Danilo Krummrich
2023-11-07 17:53 ` Danilo Krummrich
2023-11-08 3:29 ` [Intel-xe] " Luben Tuikov
2023-11-08 3:29 ` Luben Tuikov
2023-11-08 0:41 ` [Intel-xe] " Danilo Krummrich
2023-11-08 0:41 ` Danilo Krummrich
2023-11-09 6:52 ` [Intel-xe] " Luben Tuikov
2023-11-09 6:52 ` Luben Tuikov
2023-11-09 19:24 ` [Intel-xe] " Danilo Krummrich
2023-11-09 19:24 ` Danilo Krummrich
2023-11-09 23:41 ` [Intel-xe] " Danilo Krummrich
2023-11-09 23:41 ` Danilo Krummrich
2023-11-09 23:49 ` [Intel-xe] " Luben Tuikov
2023-11-09 23:49 ` Luben Tuikov
2023-11-27 13:30 ` Bert Karwatzki [this message]
2023-11-27 13:30 ` [PATCH] Revert "drm/sched: Qualify drm_sched_wakeup() by drm_sched_entity_is_ready()" Bert Karwatzki
2023-11-27 15:14 ` [Intel-xe] " Luben Tuikov
2023-11-27 15:14 ` Luben Tuikov
2023-10-31 3:24 ` [Intel-xe] [PATCH v8 4/5] drm/sched: Add drm_sched_start_timeout_unlocked helper Matthew Brost
2023-10-31 3:24 ` Matthew Brost
2023-10-31 3:24 ` [Intel-xe] [PATCH v8 5/5] drm/sched: Add a helper to queue TDR immediately Matthew Brost
2023-10-31 3:24 ` Matthew Brost
2023-10-31 3:31 ` [Intel-xe] ✗ CI.Patch_applied: failure for DRM scheduler changes for Xe (rev10) Patchwork
2023-11-01 22:16 ` [Intel-xe] [PATCH v8 0/5] DRM scheduler changes for Xe Luben Tuikov
2023-11-01 22:16 ` Luben Tuikov
2023-11-02 22:49 ` [Intel-xe] ✗ CI.Patch_applied: failure for DRM scheduler changes for Xe (rev11) Patchwork
2023-11-07 4:39 ` [Intel-xe] ✗ CI.Patch_applied: failure for DRM scheduler changes for Xe (rev12) Patchwork
2023-11-09 7:12 ` [Intel-xe] ✗ CI.Patch_applied: failure for DRM scheduler changes for Xe (rev13) Patchwork
2023-11-27 16:18 ` [Intel-xe] ✗ CI.Patch_applied: failure for DRM scheduler changes for Xe (rev14) Patchwork
2023-11-27 17:15 ` Bert Karwatzki
-- strict thread matches above, loose matches on Subject: below --
2023-11-27 12:21 [Intel-xe] [PATCH] Revert "drm/sched: Qualify drm_sched_wakeup() by drm_sched_entity_is_ready()" Bert Karwatzki
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=20231127133015.104165-1-spasswolf@web.de \
--to=spasswolf@web.de \
--cc=Liviu.Dudau@arm.com \
--cc=boris.brezillon@collabora.com \
--cc=christian.koenig@amd.com \
--cc=dakr@redhat.com \
--cc=donald.robson@imgtec.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=faith.ekstrand@collabora.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=ketil.johnsen@arm.com \
--cc=lina@asahilina.net \
--cc=ltuikov89@gmail.com \
--cc=mcanal@igalia.com \
--cc=robdclark@chromium.org \
--cc=sarah.walker@imgtec.com \
--cc=tvrtko.ursulin@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: 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.