On 2023-11-27 11:09, Bert Karwatzki wrote: > 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 > Fixes: f3123c2590005c ("drm/sched: Qualify drm_sched_wakeup() by drm_sched_entity_is_ready()") > > Signed-off-by: Bert Karwatzki <spasswolf@xxxxxx> > --- > 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 > Reviewed-by: Luben Tuikov <ltuikov89@xxxxxxxxx> Pushed to drm-misc-next. Thanks! -- Regards, Luben
Attachment:
OpenPGP_0x4C15479431A334AF.asc
Description: OpenPGP public key
Attachment:
OpenPGP_signature.asc
Description: OpenPGP digital signature
