From f4dd0e918ca426ee5ac813eca5cbfb3f42627b69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <daenzer@vmware.com>
Date: Wed, 19 May 2010 12:46:22 +0200
Subject: [PATCH] --- yaml --- r: 196561 b: refs/heads/master c:
 365048ff7f977c5983d67b63c47502c5964840e9 h: refs/heads/master i:   196559:
 45833bbf2b6118e907f27f8ac426c99a326ffb8d v: v3

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

diff --git a/[refs] b/[refs]
index c0ad69ed9188..118f37976497 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45737447ed160faaba036c0709226bf9057f7b72
+refs/heads/master: 365048ff7f977c5983d67b63c47502c5964840e9
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_ttm.c b/trunk/drivers/gpu/drm/radeon/radeon_ttm.c
index 3aa3a65800ab..e9918d88f5b0 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -451,7 +451,7 @@ static int radeon_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_
 			/* RADEON_IS_AGP is set only if AGP is active */
 			mem->bus.offset = mem->mm_node->start << PAGE_SHIFT;
 			mem->bus.base = rdev->mc.agp_base;
-			mem->bus.is_iomem = true;
+			mem->bus.is_iomem = !rdev->ddev->agp->cant_use_aperture;
 		}
 #endif
 		break;