diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2010-05-19 12:46:22 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-05-21 15:06:45 +1000 |
| commit | 365048ff7f977c5983d67b63c47502c5964840e9 (patch) | |
| tree | 451a3928c8fc781a6f81d9fc4130b9bacecfe208 /drivers/gpu | |
| parent | 45737447ed160faaba036c0709226bf9057f7b72 (diff) | |
| download | op-kernel-dev-365048ff7f977c5983d67b63c47502c5964840e9.zip op-kernel-dev-365048ff7f977c5983d67b63c47502c5964840e9.tar.gz | |
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 <daenzer@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_ttm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 3aa3a65..e9918d8 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; |
