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
