diff options
author | Takashi Iwai <tiwai@suse.de> | 2023-07-18 14:24:49 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2023-07-18 14:24:56 +0200 |
commit | 21634f0f307c8401462da2cd07507880ee17d3fc (patch) | |
tree | 8dd1b41a5a1bd9fe9a340814c4101f33df827f40 /drivers/gpu/drm/scheduler/sched_main.c | |
parent | 6d68d9cba1d0d1ee628a783eb9e7d38a0c3691b8 (diff) | |
parent | 2218e10e6fec05f76d6cd2c7eed4cb5af447360b (diff) |
Merge branch 'topic/hda-pci-ids' into for-next
Pull cleanup of HD-audio PCI IDs.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/gpu/drm/scheduler/sched_main.c')
-rw-r--r-- | drivers/gpu/drm/scheduler/sched_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index 7b2bfc10c1a5..506371c42745 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -1043,10 +1043,9 @@ static int drm_sched_main(void *param) trace_drm_run_job(sched_job, entity); fence = sched->ops->run_job(sched_job); complete_all(&entity->entity_idle); - drm_sched_fence_scheduled(s_fence); + drm_sched_fence_scheduled(s_fence, fence); if (!IS_ERR_OR_NULL(fence)) { - drm_sched_fence_set_parent(s_fence, fence); /* Drop for original kref_init of the fence */ dma_fence_put(fence); |