Merge branch 'i2c/for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[karo-tx-linux.git] / drivers / gpu / drm / radeon / radeon_sync.c

diff --git a/drivers/gpu/drm/radeon/radeon_sync.c b/drivers/gpu/drm/radeon/radeon_sync.c
index 02ac8a1de4fffc55c272e13f7ef449f644748abe..be5d7a38d3aae7078697bf362f554e53674581b8 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_sync.c
+++ b/drivers/gpu/drm/radeon/radeon_sync.c
@@ -92,7 +92,7 @@ int radeon_sync_resv(struct radeon_device *rdev,
                     bool shared)
 {
        struct reservation_object_list *flist;
-       struct fence *f;
+       struct dma_fence *f;
        struct radeon_fence *fence;
        unsigned i;
        int r = 0;
@@ -103,7 +103,7 @@ int radeon_sync_resv(struct radeon_device *rdev,
        if (fence && fence->rdev == rdev)
                radeon_sync_fence(sync, fence);
        else if (f)
-               r = fence_wait(f, true);
+               r = dma_fence_wait(f, true);
 
        flist = reservation_object_get_list(resv);
        if (shared || !flist || r)
@@ -116,7 +116,7 @@ int radeon_sync_resv(struct radeon_device *rdev,
                if (fence && fence->rdev == rdev)
                        radeon_sync_fence(sync, fence);
                else
-                       r = fence_wait(f, true);
+                       r = dma_fence_wait(f, true);
 
                if (r)
                        break;