Merge tag 'drm-next-2022-10-07-1' of git://anongit.freedesktop.org/drm/drm

9d84bb40 · Linus Torvalds <[email protected]> · 2022-10-07 09:47:47 -07:00

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"

Commit: 9d84bb40bcb30a7fa16f33baa967aeb9953dda78
Parents: 7c989b1d · bafaf67c

Merge commit. Changes below are compared with the first parent: 7c989b1d.

Changes

1 files changed · +2 −2

File	Status	Add	Del	Content
drivers/gpu/drm/scheduler/sched_main.c	modified	+2	−2	View file

drivers/gpu/drm/scheduler/sched_main.c

View file

diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c
index 4f2395d..e5a4ecd 100644
--- a/drivers/gpu/drm/scheduler/sched_main.c
+++ b/drivers/gpu/drm/scheduler/sched_main.c
@@ -829,7 +829,7 @@ 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 && dma_fence_is_signaled(&job->s_fence->finished)) {
 		/* remove job from pending_list */
 		list_del_init(&job->list);
 
@@ -841,7 +841,7 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched)
 
 		if (next) {
 			next->s_fence->scheduled.timestamp =
-				job->s_fence->parent->timestamp;
+				job->s_fence->finished.timestamp;
 			/* start TO timer for next job */
 			drm_sched_start_timeout(sched);
 		}