Commit 9d84bb40 authored by Linus Torvalds's avatar Linus Torvalds

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"
parents 7c989b1d bafaf67c
...@@ -829,7 +829,7 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched) ...@@ -829,7 +829,7 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched)
job = list_first_entry_or_null(&sched->pending_list, job = list_first_entry_or_null(&sched->pending_list,
struct drm_sched_job, 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 */ /* remove job from pending_list */
list_del_init(&job->list); list_del_init(&job->list);
...@@ -841,7 +841,7 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched) ...@@ -841,7 +841,7 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched)
if (next) { if (next) {
next->s_fence->scheduled.timestamp = next->s_fence->scheduled.timestamp =
job->s_fence->parent->timestamp; job->s_fence->finished.timestamp;
/* start TO timer for next job */ /* start TO timer for next job */
drm_sched_start_timeout(sched); drm_sched_start_timeout(sched);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment