drm/nouveau: Use lazy fence waits when doing software interchannel sync.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index 5f9f66f350674527c844569c6ee9d86289e383e1..0a22955998e81a36b273556cf5223c083fd98b51 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -390,7 +390,7 @@ nouveau_fence_sync(struct nouveau_fence *fence,
        if (!sema) {
                /* Early card or broken userspace, fall back to
                 * software sync. */
-               return nouveau_fence_wait(fence, NULL, false, false);
+               return nouveau_fence_wait(fence, NULL, true, false);
        }
 
        /* try to take chan's mutex, if we can't take it right away
@@ -399,7 +399,7 @@ nouveau_fence_sync(struct nouveau_fence *fence,
         */
        if (!mutex_trylock(&chan->mutex)) {
                free_semaphore(&sema->ref);
-               return nouveau_fence_wait(fence, NULL, false, false);
+               return nouveau_fence_wait(fence, NULL, true, false);
        }
 
        /* Make wchan wait until it gets signalled */