projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3cc808e
)
drm/sched: Partial revert of "Qualify drm_sched_wakeup() by drm_sched_entity_is_ready()"
author
Bert Karwatzki
<spasswolf@web.de>
Mon, 27 Nov 2023 16:09:55 +0000
(17:09 +0100)
committer
Luben Tuikov
<ltuikov89@gmail.com>
Tue, 28 Nov 2023 19:16:56 +0000
(14:16 -0500)
Commit
f3123c2590005c
, in combination with the use of work queues by the GPU
scheduler, leads to random lock-ups of the GUI.
This is a partial revert of of commit
f3123c2590005c
since drm_sched_wakeup() still
needs its entity argument to pass it to drm_sched_can_queue().
Link:
https://gitlab.freedesktop.org/drm/amd/-/issues/2994
Link:
https://lists.freedesktop.org/archives/dri-devel/2023-November/431606.html
Signed-off-by: Bert Karwatzki <spasswolf@web.de>
Link:
https://patchwork.freedesktop.org/patch/msgid/20231127160955.87879-1-spasswolf@web.de
Link:
https://lore.kernel.org/r/36bece178ff5dc705065e53d1e5e41f6db6d87e4.camel@web.de
Fixes:
f3123c2590005c
("drm/sched: Qualify drm_sched_wakeup() by drm_sched_entity_is_ready()")
Reviewed-by: Luben Tuikov <ltuikov89@gmail.com>
Signed-off-by: Luben Tuikov <ltuikov89@gmail.com>
drivers/gpu/drm/scheduler/sched_main.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/gpu/drm/scheduler/sched_main.c
b/drivers/gpu/drm/scheduler/sched_main.c
index 682aebe96db781c8ff21cf72d1934b4073781528..550492a7a031d7827b2e167098c495908bee82aa 100644
(file)
--- 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);
}
/**