From b1f476428a1c1a3478169614d1c988360ce3c801 Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Mon, 18 Oct 2010 03:56:14 +0200 Subject: [PATCH] --- yaml --- r: 228533 b: refs/heads/master c: 2a6789ae5e8a6b25a0835834655205166a757a81 h: refs/heads/master i: 228531: c277b6cb6ad474760b4496797fabc47430b2be1b v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_fence.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d921dd02d52d..2286ea0c9669 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f091a3d403065416b7d27221bbeb956481132ffd +refs/heads/master: 2a6789ae5e8a6b25a0835834655205166a757a81 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_fence.c b/trunk/drivers/gpu/drm/nouveau/nouveau_fence.c index 0a22955998e8..e1ae9bab6e41 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_fence.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_fence.c @@ -64,6 +64,7 @@ nouveau_fence_del(struct kref *ref) struct nouveau_fence *fence = container_of(ref, struct nouveau_fence, refcount); + nouveau_channel_ref(NULL, &fence->channel); kfree(fence); } @@ -113,7 +114,7 @@ nouveau_fence_new(struct nouveau_channel *chan, struct nouveau_fence **pfence, if (!fence) return -ENOMEM; kref_init(&fence->refcount); - fence->channel = chan; + nouveau_channel_ref(chan, &fence->channel); if (emit) ret = nouveau_fence_emit(fence);