svn commit: r259234 - stable/10/sys/dev/drm2/radeon

[Jean-Sebastien Pedron]

Author: dumbbell
Date: Wed Dec 11 22:26:09 2013
New Revision: 259234
URL: http://svnweb.freebsd.org/changeset/base/259234

Log:
  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@

Modified:
  stable/10/sys/dev/drm2/radeon/radeon_agp.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/drm2/radeon/radeon_agp.c
==============================================================================
--- stable/10/sys/dev/drm2/radeon/radeon_agp.c	Wed Dec 11 22:00:03 2013	(r259233)
+++ stable/10/sys/dev/drm2/radeon/radeon_agp.c	Wed Dec 11 22:26:09 2013	(r259234)
@@ -153,11 +153,11 @@ int radeon_agp_init(struct radeon_device
 		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->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",