Merge tag 'drm-misc-fixes-2022-05-26' of git://anongit.freedesktop.org/drm/drm-misc...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / panfrost / panfrost_job.c

diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c
index 22c2af1a4627d3efd209c162c39fd2e000c81e5d..7c4208476fbd34457e3c248eed53f1a9e9a02bbb 100644 (file)
--- a/drivers/gpu/drm/panfrost/panfrost_job.c
+++ b/drivers/gpu/drm/panfrost/panfrost_job.c
@@ -247,6 +247,10 @@ static int panfrost_acquire_object_fences(struct drm_gem_object **bos,
        int i, ret;
 
        for (i = 0; i < bo_count; i++) {
+               ret = dma_resv_reserve_fences(bos[i]->resv, 1);
+               if (ret)
+                       return ret;
+
                /* panfrost always uses write mode in its current uapi */
                ret = drm_sched_job_add_implicit_dependencies(job, bos[i],
                                                              true);
@@ -264,7 +268,7 @@ static void panfrost_attach_object_fences(struct drm_gem_object **bos,
        int i;
 
        for (i = 0; i < bo_count; i++)
-               dma_resv_add_excl_fence(bos[i]->resv, fence);
+               dma_resv_add_fence(bos[i]->resv, fence, DMA_RESV_USAGE_WRITE);
 }
 
 int panfrost_job_push(struct panfrost_job *job)