diff options
| author | dumbbell <dumbbell@FreeBSD.org> | 2013-12-11 22:26:09 +0000 |
|---|---|---|
| committer | dumbbell <dumbbell@FreeBSD.org> | 2013-12-11 22:26:09 +0000 |
| commit | 50221324bd40404e88dea60c7f368087bdd21a77 (patch) | |
| tree | bfbe1b8111b78d221c4e099f41c145ca20ec15df /sys/dev/drm2 | |
| parent | 7990e5891f29734b09ef3c96c6c96e5b021305b0 (diff) | |
| download | FreeBSD-src-50221324bd40404e88dea60c7f368087bdd21a77.zip FreeBSD-src-50221324bd40404e88dea60c7f368087bdd21a77.tar.gz | |
MFC r259101:
drm/radeon: agp_info->ai_aperture_size is in bytes, not Mbytes
This fixes radeon_agp_init() and gtt_size is now correct. However, this
is not enough to make Radeon AGP cards work: ttm_agp_backend.c isn't
implemented yet.
Submitted by: tijl@
Diffstat (limited to 'sys/dev/drm2')
| -rw-r--r-- | sys/dev/drm2/radeon/radeon_agp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/drm2/radeon/radeon_agp.c b/sys/dev/drm2/radeon/radeon_agp.c index dec4045..0ac376b 100644 --- a/sys/dev/drm2/radeon/radeon_agp.c +++ b/sys/dev/drm2/radeon/radeon_agp.c @@ -153,11 +153,11 @@ int radeon_agp_init(struct radeon_device *rdev) return ret; } - if (rdev->ddev->agp->info.ai_aperture_size < 32) { + if ((rdev->ddev->agp->info.ai_aperture_size >> 20) < 32) { drm_agp_release(rdev->ddev); dev_warn(rdev->dev, "AGP aperture too small (%zuM) " "need at least 32M, disabling AGP\n", - rdev->ddev->agp->info.ai_aperture_size); + rdev->ddev->agp->info.ai_aperture_size >> 20); return -EINVAL; } @@ -246,7 +246,7 @@ int radeon_agp_init(struct radeon_device *rdev) } rdev->mc.agp_base = rdev->ddev->agp->info.ai_aperture_base; - rdev->mc.gtt_size = rdev->ddev->agp->info.ai_aperture_size << 20; + rdev->mc.gtt_size = rdev->ddev->agp->info.ai_aperture_size; rdev->mc.gtt_start = rdev->mc.agp_base; rdev->mc.gtt_end = rdev->mc.gtt_start + rdev->mc.gtt_size - 1; dev_info(rdev->dev, "GTT: %juM 0x%08jX - 0x%08jX\n", |
