From: Jerome Glisse <jglisse@redhat.com>
Date: Wed, 5 May 2010 09:02:44 +0000 (+0200)
Subject: drm/ttm: fix, avoid iomapping system memory
X-Git-Tag: v2.6.35-rc1~18^2~78
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=9e51159c14c29ebd485a45ba56f148e180d62c29;p=safe%2Fjmp%2Flinux-2.6

drm/ttm: fix, avoid iomapping system memory

If the memory is not iomem we should not try to
ioremap it. Should fix :

https://bugs.freedesktop.org/show_bug.cgi?id=27822

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Tested-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index a37a948..13012a1 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -113,7 +113,7 @@ int ttm_mem_reg_ioremap(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem,
 
 	*virtual = NULL;
 	ret = ttm_mem_io_reserve(bdev, mem);
-	if (ret)
+	if (ret || !mem->bus.is_iomem)
 		return ret;
 
 	if (mem->bus.addr) {