summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Glisse <jglisse@redhat.com>2010-05-05 11:02:44 +0200
committerDave Airlie <airlied@redhat.com>2010-05-07 01:15:47 +0200
commit9e51159c14c29ebd485a45ba56f148e180d62c29 (patch)
treed01a721b7aed89761d3812e67a19c25fc22b40e1
parentdrm/radeon/kms: R3XX-R4XX fix GPU reset code (diff)
downloadlinux-9e51159c14c29ebd485a45ba56f148e180d62c29.tar.xz
linux-9e51159c14c29ebd485a45ba56f148e180d62c29.zip
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>
-rw-r--r--drivers/gpu/drm/ttm/ttm_bo_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index a37a94872a14..13012a1f1486 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) {