From ed4965a0221610bd5036eae765cafa56d2de08ed Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Mon, 18 Oct 2010 03:57:19 +0200 Subject: [PATCH] --- yaml --- r: 228535 b: refs/heads/master c: 889fa93dc0ab94b9255e9dd8e2036facfee5485e h: refs/heads/master i: 228533: b1f476428a1c1a3478169614d1c988360ce3c801 228531: c277b6cb6ad474760b4496797fabc47430b2be1b 228527: 9d8ceab40a1f7c331a85814378f0c76fae389682 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_fence.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d3e2b1900f82..81d416eda6d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b478addc0bfaaf5031e36ee166c9457ceae628c +refs/heads/master: 889fa93dc0ab94b9255e9dd8e2036facfee5485e diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_fence.c b/trunk/drivers/gpu/drm/nouveau/nouveau_fence.c index 29fe03bc4870..f70bec835f5f 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_fence.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_fence.c @@ -490,6 +490,8 @@ nouveau_fence_channel_fini(struct nouveau_channel *chan) { struct nouveau_fence *tmp, *fence; + spin_lock(&chan->fence.lock); + list_for_each_entry_safe(fence, tmp, &chan->fence.pending, entry) { fence->signalled = true; list_del(&fence->entry); @@ -499,6 +501,8 @@ nouveau_fence_channel_fini(struct nouveau_channel *chan) kref_put(&fence->refcount, nouveau_fence_del); } + + spin_unlock(&chan->fence.lock); } int