Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / vmwgfx / vmwgfx_execbuf.c

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
index dd2ff441068eca222553471f740e4e49e3aa8055..d49de4905efa485c8288b876e074a862e39f5326 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
@@ -4501,7 +4501,7 @@ int vmw_execbuf_ioctl(struct drm_device *dev, void *data,
                        goto mksstats_out;
                }
 
-               ret = vmw_wait_dma_fence(dev_priv->fman, in_fence);
+               ret = dma_fence_wait(in_fence, true);
                if (ret)
                        goto out;
        }