diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-07 18:47:47 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-07 18:47:47 +0200 |
| commit | 9d84bb40bcb30a7fa16f33baa967aeb9953dda78 (patch) | |
| tree | 875c4a74cdea74e861a9ff84fe9ca9674c1f7ee5 | |
| parent | Merge tag 'for-6.1/passthrough-2022-10-04' of git://git.kernel.dk/linux (diff) | |
| parent | Revert "drm/sched: Use parent fence instead of finished" (diff) | |
| download | linux-9d84bb40bcb30a7fa16f33baa967aeb9953dda78.tar.xz linux-9d84bb40bcb30a7fa16f33baa967aeb9953dda78.zip | |
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"
| -rw-r--r-- | drivers/gpu/drm/scheduler/sched_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index 4f2395d1a791..e5a4ecde0063 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); } |