From 5f66c606d9579572637be86fa0795ffb2a53ffc6 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 25 Nov 2011 16:35:34 +1000
Subject: [PATCH] --- yaml --- r: 276297 b: refs/heads/master c:
 a10e9e1dbb39970f232b1e2b0e4f738e2d77079f h: refs/heads/master i:   276295:
 49a73adb610961e9700baa345a079834cf041c28 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c7aca0b8aecf..d907f480d107 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a97b4ace09d7d3fe213a73bc466ca33af98c91c
+refs/heads/master: a10e9e1dbb39970f232b1e2b0e4f738e2d77079f
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c
index b75258a9fe44..c8a463b76c89 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_sgdma.c
@@ -67,7 +67,10 @@ nouveau_sgdma_clear(struct ttm_backend *be)
 			pci_unmap_page(dev->pdev, nvbe->pages[nvbe->nr_pages],
 				       PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
 		}
+		nvbe->unmap_pages = false;
 	}
+
+	nvbe->pages = NULL;
 }
 
 static void