drm/nouveau: rework to new fence interface

[deliverable/linux.git] / drivers / gpu / drm / nouveau / nouveau_gem.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 1650c0bdb0fce2d93dc39455f380c534d34b030c..d68c9656e4094760eb305cfe8e54bad8aeb4cff5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -425,18 +425,6 @@ retry:
        return 0;
 }
 
-static int
-validate_sync(struct nouveau_channel *chan, struct nouveau_bo *nvbo)
-{
-       struct nouveau_fence *fence = nvbo->bo.sync_obj;
-       int ret = 0;
-
-       if (fence)
-               ret = nouveau_fence_sync(fence, chan);
-
-       return ret;
-}
-
 static int
 validate_list(struct nouveau_channel *chan, struct nouveau_cli *cli,
              struct list_head *list, struct drm_nouveau_gem_pushbuf_bo *pbbo,
@@ -466,9 +454,10 @@ validate_list(struct nouveau_channel *chan, struct nouveau_cli *cli,
                        return ret;
                }
 
-               ret = validate_sync(chan, nvbo);
+               ret = nouveau_fence_sync(nvbo, chan);
                if (unlikely(ret)) {
-                       NV_PRINTK(error, cli, "fail post-validate sync\n");
+                       if (ret != -ERESTARTSYS)
+                               NV_PRINTK(error, cli, "fail post-validate sync\n");
                        return ret;
                }