From: Michel Dänzer Date: Wed, 19 May 2010 10:46:22 +0000 (+0200) Subject: drm/radeon: AGP memory is only I/O if the aperture can be mapped by the CPU. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=365048ff7f977c5983d67b63c47502c5964840e9;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git drm/radeon: AGP memory is only I/O if the aperture can be mapped by the CPU. Fixes AGP initialization failure with Apple UniNorth bridges due to trying to ioremap() normal RAM. Signed-off-by: Michel Dänzer Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 3aa3a65800ab..e9918d88f5b0 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/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;