Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / etnaviv / etnaviv_gem_submit.c

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
index 225fa5879ebd99b51b147db32175884784c4ef4f..b03c20c14ca1ebdcf44b3298b74e2f7ca6f303ef 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
@@ -189,13 +189,13 @@ static int submit_fence_sync(struct etnaviv_gem_submit *submit)
                        continue;
 
                if (bo->flags & ETNA_SUBMIT_BO_WRITE) {
-                       ret = dma_resv_get_fences(robj, &bo->excl,
+                       ret = dma_resv_get_fences(robj, NULL,
                                                  &bo->nr_shared,
                                                  &bo->shared);
                        if (ret)
                                return ret;
                } else {
-                       bo->excl = dma_resv_get_excl_unlocked(robj);
+                       bo->excl = dma_fence_get(dma_resv_excl_fence(robj));
                }
 
        }