diff options
| author | Christian König <christian.koenig@amd.com> | 2022-09-29 20:53:53 +0300 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2022-10-05 13:38:00 +0300 |
| commit | 65b698bf400f00ab452d5f27ecad84ab8c826014 (patch) | |
| tree | fd6d9d2b142568ee348f0fdedda86f8b8f8f6358 /drivers/gpu/drm/scheduler | |
| parent | 7c022f516fbe2d4b1b4abdd1c4b7687ec81a6ed9 (diff) | |
| download | linux-65b698bf400f00ab452d5f27ecad84ab8c826014.tar.xz | |
drm/sched: add missing NULL check in drm_sched_get_cleanup_job v2
Otherwise we would crash if the job is not resubmitted.
v2: fix second usage of s_fence->parent as well.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Steven Price <steven.price@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221004132831.134986-1-christian.koenig@amd.com
Diffstat (limited to 'drivers/gpu/drm/scheduler')
| -rw-r--r-- | drivers/gpu/drm/scheduler/sched_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index ce86b03e8386..4cc59bae38dd 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -919,7 +919,8 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched) job = list_first_entry_or_null(&sched->pending_list, struct drm_sched_job, list); - if (job && dma_fence_is_signaled(job->s_fence->parent)) { + if (job && (!job->s_fence->parent || + dma_fence_is_signaled(job->s_fence->parent))) { /* remove job from pending_list */ list_del_init(&job->list); @@ -929,7 +930,7 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched) next = list_first_entry_or_null(&sched->pending_list, typeof(*next), list); - if (next) { + if (next && job->s_fence->parent) { next->s_fence->scheduled.timestamp = job->s_fence->parent->timestamp; /* start TO timer for next job */ |