From 30af8755be5b8beff27c527472d9319080c6a35d Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Mon, 31 Dec 2012 03:34:59 +0200
Subject: [PATCH] --- yaml --- r: 348243 b: refs/heads/master c:
 eda85d6ad490923152544fba0473798b6cc0edf6 h: refs/heads/master i:   348241:
 58f69abef66f9a7b10f82659dc8cfe671ab3d14c   348239:
 a609abf88168604304f7c3fa9fdda74a3a2e9753 v: v3

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

diff --git a/[refs] b/[refs]
index 50a3915a60a0..ea7cbd4d1159 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57cdf82ce578959ec871899ad4461475148009e0
+refs/heads/master: eda85d6ad490923152544fba0473798b6cc0edf6
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c b/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c
index 5614c89148cb..69d7b1d0b9d6 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -1276,7 +1276,7 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
 		if (drm->agp.stat == ENABLED) {
 			mem->bus.offset = mem->start << PAGE_SHIFT;
 			mem->bus.base = drm->agp.base;
-			mem->bus.is_iomem = true;
+			mem->bus.is_iomem = !dev->agp->cant_use_aperture;
 		}
 #endif
 		break;