Skip to content

Commit

Permalink
Merge tag 'drm-next-2022-10-07-1' of git://anongit.freedesktop.org/dr…
Browse files Browse the repository at this point in the history
…m/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"
  • Loading branch information
Linus Torvalds committed Oct 7, 2022
2 parents 7c989b1 + bafaf67 commit 9d84bb4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/scheduler/sched_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);
}
Expand Down

0 comments on commit 9d84bb4

Please sign in to comment.