diff --git a/[refs] b/[refs]
index 3796223cf4ff..8bf775af1d6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa5ac7358c010dcb5916d1d0c2651ae65a4f7ab7
+refs/heads/master: fcccab2e4eb8d579837481054cc2cb28eea0baef
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_fence.c b/trunk/drivers/gpu/drm/nouveau/nouveau_fence.c
index 5f9f66f35067..0a22955998e8 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/trunk/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 */