Merge v6.5-rc1 into drm-misc-fixes

[platform/kernel/linux-starfive.git] / drivers / gpu / drm / scheduler / sched_fence.c

diff --git a/drivers/gpu/drm/scheduler/sched_fence.c b/drivers/gpu/drm/scheduler/sched_fence.c
index b6e70dd..06cedfe 100644 (file)
--- a/drivers/gpu/drm/scheduler/sched_fence.c
+++ b/drivers/gpu/drm/scheduler/sched_fence.c
@@ -77,8 +77,10 @@ void drm_sched_fence_scheduled(struct drm_sched_fence *fence,
        dma_fence_signal(&fence->scheduled);
 }
 
-void drm_sched_fence_finished(struct drm_sched_fence *fence)
+void drm_sched_fence_finished(struct drm_sched_fence *fence, int result)
 {
+       if (result)
+               dma_fence_set_error(&fence->finished, result);
        dma_fence_signal(&fence->finished);
 }