diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2023-03-30 08:53:12 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2023-03-30 08:53:12 +0200 |
| commit | 8ba264f418f734aade3a77086bb1d51d0e2723ce (patch) | |
| tree | ca6749e28544c393305b8606c0230ac50126041a /drivers/gpu/drm/scheduler/sched_main.c | |
| parent | fbb3b3500f76ec8b741bd2d0e761ca3e856ad924 (diff) | |
| parent | 82bbec189ab34873688484cd14189a5392946fbb (diff) | |
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
Backmerge to get rc4.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/scheduler/sched_main.c')
| -rw-r--r-- | drivers/gpu/drm/scheduler/sched_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index 7db586e6fce6..f6801eb21820 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -1048,7 +1048,7 @@ static int drm_sched_main(void *param) drm_sched_fence_scheduled(s_fence); if (!IS_ERR_OR_NULL(fence)) { - s_fence->parent = dma_fence_get(fence); + drm_sched_fence_set_parent(s_fence, fence); /* Drop for original kref_init of the fence */ dma_fence_put(fence); |