aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/agp/intel-gtt.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2010-09-12 08:04:03 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2010-09-21 06:40:06 -0400
commit0af9e92e779602bdd6d4d19acf63b4802fab91b6 (patch)
treed508f1db16ab519bc197f9691427455963562cfc /drivers/char/agp/intel-gtt.c
parentaaa62591199162e6496b4f47cac4f5923bc571d1 (diff)
intel-gtt: clean up gtt size reporting
Consolidate everything in intel-gtt.c and also kill the export of intel_max_stolen. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/char/agp/intel-gtt.c')
-rw-r--r--drivers/char/agp/intel-gtt.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 57dc50488d18..4f84063bccdd 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -41,7 +41,6 @@
41 41
42/* Max amount of stolen space, anything above will be returned to Linux */ 42/* Max amount of stolen space, anything above will be returned to Linux */
43int intel_max_stolen = 32 * 1024 * 1024; 43int intel_max_stolen = 32 * 1024 * 1024;
44EXPORT_SYMBOL(intel_max_stolen);
45 44
46static const struct aper_size_info_fixed intel_i810_sizes[] = 45static const struct aper_size_info_fixed intel_i810_sizes[] =
47{ 46{
@@ -756,6 +755,11 @@ static int intel_gtt_init(void)
756 intel_private.base.gtt_mappable_entries = intel_gtt_mappable_entries(); 755 intel_private.base.gtt_mappable_entries = intel_gtt_mappable_entries();
757 intel_private.base.gtt_total_entries = intel_gtt_total_entries(); 756 intel_private.base.gtt_total_entries = intel_gtt_total_entries();
758 757
758 dev_info(&intel_private.bridge_dev->dev,
759 "detected gtt size: %dK total, %dK mappable\n",
760 intel_private.base.gtt_total_entries * 4,
761 intel_private.base.gtt_mappable_entries * 4);
762
759 gtt_map_size = intel_private.base.gtt_total_entries * 4; 763 gtt_map_size = intel_private.base.gtt_total_entries * 4;
760 764
761 intel_private.gtt = ioremap(intel_private.gtt_bus_addr, 765 intel_private.gtt = ioremap(intel_private.gtt_bus_addr,