From d642eb96dbc7068fd62cb9c9e7a0f8ed03c22083 Mon Sep 17 00:00:00 2001 From: Marcin Slusarz Date: Sun, 25 Nov 2012 23:02:28 +0100 Subject: [PATCH] --- yaml --- r: 345470 b: refs/heads/master c: 124ea297c8f0e0a3a567af0894fdbe05caaf80ec h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_chan.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4ea941c26146..4850e59d4bf6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f69e7605d6b072b9890845bb6d9f982bcd879ec +refs/heads/master: 124ea297c8f0e0a3a567af0894fdbe05caaf80ec diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_chan.c b/trunk/drivers/gpu/drm/nouveau/nouveau_chan.c index 1363578bf945..174300b6a02e 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_chan.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_chan.c @@ -76,6 +76,8 @@ nouveau_channel_del(struct nouveau_channel **pchan) nouveau_object_del(client, NVDRM_DEVICE, chan->push.handle); nouveau_bo_vma_del(chan->push.buffer, &chan->push.vma); nouveau_bo_unmap(chan->push.buffer); + if (chan->push.buffer && chan->push.buffer->pin_refcnt) + nouveau_bo_unpin(chan->push.buffer); nouveau_bo_ref(NULL, &chan->push.buffer); kfree(chan); }