From 9d8ceab40a1f7c331a85814378f0c76fae389682 Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Thu, 14 Oct 2010 21:55:23 +0200 Subject: [PATCH] --- yaml --- r: 228527 b: refs/heads/master c: fcccab2e4eb8d579837481054cc2cb28eea0baef h: refs/heads/master i: 228525: 733d9133828f6e68f4f14ae3ba7b9c912d6abccb 228523: 48ae2aa65062c8dbefbf2bf0fe3216fb48d84ee7 228519: db231fc551668e159e040a52a7cb84154570a88f 228511: 253ab302a5dfab063c2c7a47eb9300262a1221b1 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_fence.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 */