Browse Source

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>
Francisco Jerez 14 years ago
parent
commit
fcccab2e4e
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/gpu/drm/nouveau/nouveau_fence.c

+ 2 - 2
drivers/gpu/drm/nouveau/nouveau_fence.c

@@ -390,7 +390,7 @@ nouveau_fence_sync(struct nouveau_fence *fence,
 	if (!sema) {
 	if (!sema) {
 		/* Early card or broken userspace, fall back to
 		/* Early card or broken userspace, fall back to
 		 * software sync. */
 		 * 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
 	/* 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)) {
 	if (!mutex_trylock(&chan->mutex)) {
 		free_semaphore(&sema->ref);
 		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 */
 	/* Make wchan wait until it gets signalled */