From 9e51159c14c29ebd485a45ba56f148e180d62c29 Mon Sep 17 00:00:00 2001 From: Jerome Glisse Date: Wed, 5 May 2010 11:02:44 +0200 Subject: drm/ttm: fix, avoid iomapping system memory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Rafał Miłecki Signed-off-by: Dave Airlie --- drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/gpu/drm/ttm/ttm_bo_util.c') 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) { -- cgit v1.2.3