drm/scheduler: fix drm_sched_get_cleanup_job
Subsystems (3)
PATCH 1/1 drm/scheduler: fix drm_sched_get_cleanup_job
From: Christian König <[email protected]>
We are racing to initialize sched->thread here, just always check the current thread.
--- drivers/gpu/drm/scheduler/sched_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/scheduler/sched_main.c +1 -1
@@ -676,7 +676,7 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched)*/ if ((sched->timeout !=MAX_SCHEDULE_TIMEOUT && !cancel_delayed_work (&sched->work_tdr)) || -__kthread_should_park (sched->thread)) +kthread_should_park ())return NULL ;spin_lock (&sched->job_list_lock);
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Andrey
Quoted 16 lines · Kent Russell
From: Christian König <[email protected]>
We are racing to initialize
sched->threadhere, just always check the current thread.Signed-off-by Christian Koenig <[email protected]>Reviewed-by Kent Russell <[email protected]>--- drivers/gpu/drm/scheduler/sched_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/scheduler/sched_main.c +0
-0
drivers/gpu/drm/scheduler/sched_main.c drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched) · line 682
Quoted 8 lines
drivers/gpu/drm/scheduler/sched_main.c +1
-1@@ -676,7 +676,7 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched)*/ if ((sched->timeout !=MAX_SCHEDULE_TIMEOUT && !cancel_delayed_work (&sched->work_tdr)) || -__kthread_should_park (sched->thread)) +kthread_should_park ())return NULL ;spin_lock (&sched->job_list_lock);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sorry for the holiday/vacation/COVID-19 delay. I've just pushed this patch into drm-misc-fixes.
I assume it already landed in our internal branches?
Thanks,
Christian.
Am 14.04.20 um 16:33 schrieb Andrey Grodzovsky:
Quoted 16 lines
Reviewed-by Andrey Grodzovsky <[email protected]>Andrey
Quoted 11 lines · Kent Russell
From: Christian König <[email protected]>
We are racing to initialize
sched->threadhere, just always check the current thread.Signed-off-by Christian Koenig <[email protected]>Reviewed-by Kent Russell <[email protected]>---
drivers/gpu/drm/scheduler/sched_main.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines
Quoted 7 lines
drivers/gpu/drm/scheduler/sched_main.c +0
-0@@ -676,7 +676,7 @@ drm_sched_get_cleanup_job(structdrm_gpu_scheduler *sched) */ Quoted 6 lines
if ((
sched->timeout!=MAX_SCHEDULE_TIMEOUT&& !cancel_delayed_work(&sched->work_tdr)) || -__kthread_should_park(sched->thread)) +kthread_should_park())
return NULL;spin_lock(&sched->job_list_lock);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only - Internal Distribution Only]
It's all good. I pushed a copy to amd-staging-drm-next, reviewed by Andrey. Thanks for pushing it to drm-misc-fixes!
Kent
Quoted 32 lines
-----Original Message-----
From: Koenig, Christian <[email protected]>
Sent: Wednesday, April 15, 2020 6:36 AM
To: Grodzovsky, Andrey <[email protected]>; Russell, Kent <[email protected]>; [email protected]
Subject: Re: [PATCH] drm/scheduler: fixdrm_sched_get_cleanup_jobSorry for the holiday/vacation/COVID-19 delay. I've just pushed this patch into drm-misc-fixes.
I assume it already landed in our internal branches?
Thanks,
Christian.Am 14.04.20 um 16:33 schrieb Andrey Grodzovsky:
Quoted 16 lines
Reviewed-by Andrey Grodzovsky <[email protected]>Andrey
Quoted 11 lines · Kent Russell
From: Christian König <[email protected]>
We are racing to initialize
sched->threadhere, just always check the current thread.Signed-off-by Christian Koenig <[email protected]>Reviewed-by Kent Russell <[email protected]>---
drivers/gpu/drm/scheduler/sched_main.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 14 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/scheduler/sched_main.c +0
-0@@ -676,7 +676,7 @@ drm_sched_get_cleanup_job(structQuoted 8 lines
Quoted 8 lines
drivers/gpu/drm/scheduler/sched_main.c +0
-0drm_gpu_scheduler *sched) */ if ((
sched->timeout!=MAX_SCHEDULE_TIMEOUT&& !cancel_delayed_work(&sched->work_tdr)) || -__kthread_should_park(sched->thread)) +kthread_should_park())
return NULL;spin_lock(&sched->job_list_lock);
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx