From 64aa8167a309be603a7ed9c03c0bddccc1878b90 Mon Sep 17 00:00:00 2001
From: Jerome Glisse <jglisse@redhat.com>
Date: Tue, 1 Nov 2011 19:07:31 -0400
Subject: [PATCH] --- yaml --- r: 282486 b: refs/heads/master c:
 f9517e63ffae6a1062a0a2ac4eea60be49b9dfd4 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/gpu/drm/ttm/ttm_tt.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9b5535db0315..3ac6c3443a01 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e2656804a34f58c2bf557465ab77f8a26a500eb
+refs/heads/master: f9517e63ffae6a1062a0a2ac4eea60be49b9dfd4
diff --git a/trunk/drivers/gpu/drm/ttm/ttm_tt.c b/trunk/drivers/gpu/drm/ttm/ttm_tt.c
index 90527a2ce04c..54bbbadba93c 100644
--- a/trunk/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/trunk/drivers/gpu/drm/ttm/ttm_tt.c
@@ -320,7 +320,7 @@ struct ttm_tt *ttm_tt_create(struct ttm_bo_device *bdev, unsigned long size,
 	ttm->dummy_read_page = dummy_read_page;
 
 	ttm_tt_alloc_page_directory(ttm);
-	if (!ttm->pages) {
+	if (!ttm->pages || !ttm->dma_address) {
 		ttm_tt_destroy(ttm);
 		printk(KERN_ERR TTM_PFX "Failed allocating page table\n");
 		return NULL;