summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2010-10-14 21:55:23 +0200
committerBen Skeggs <bskeggs@redhat.com>2010-12-03 15:06:33 +1000
commitfcccab2e4eb8d579837481054cc2cb28eea0baef (patch)
tree666089154759a6a6f33465c7dbe3017a3605c397
parentaa5ac7358c010dcb5916d1d0c2651ae65a4f7ab7 (diff)
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>
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_fence.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index 5f9f66f3506..0a22955998e 100644
--- 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 */