Skip to content

Commit 9d84bb4

Browse files
committed
Merge tag 'drm-next-2022-10-07-1' of git://anongit.freedesktop.org/drm/drm
Pull drm fix from Dave Airlie: "This reverts the patch I found with rough bisection to instability around fences and the oops I got from netconsole. sched: - revert patch causing oopses" * tag 'drm-next-2022-10-07-1' of git://anongit.freedesktop.org/drm/drm: Revert "drm/sched: Use parent fence instead of finished"
2 parents 7c989b1 + bafaf67 commit 9d84bb4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/gpu/drm/scheduler/sched_main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched)
829829
job = list_first_entry_or_null(&sched->pending_list,
830830
struct drm_sched_job, list);
831831

832-
if (job && dma_fence_is_signaled(job->s_fence->parent)) {
832+
if (job && dma_fence_is_signaled(&job->s_fence->finished)) {
833833
/* remove job from pending_list */
834834
list_del_init(&job->list);
835835

@@ -841,7 +841,7 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched)
841841

842842
if (next) {
843843
next->s_fence->scheduled.timestamp =
844-
job->s_fence->parent->timestamp;
844+
job->s_fence->finished.timestamp;
845845
/* start TO timer for next job */
846846
drm_sched_start_timeout(sched);
847847
}

0 commit comments

Comments
 (0)