Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0af9e92e authored by Daniel Vetter's avatar Daniel Vetter Committed by Chris Wilson
Browse files

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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent aaa62591

drivers/char/agp/intel-gtt.c

+5 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 


/* Max amount of stolen space, anything above will be returned to Linux */

int intel_max_stolen = 32 * 1024 * 1024;

EXPORT_SYMBOL(intel_max_stolen);



static const struct aper_size_info_fixed intel_i810_sizes[] =

{
@@ -756,6 +755,11 @@ static int intel_gtt_init(void) 
	intel_private.base.gtt_mappable_entries = intel_gtt_mappable_entries();

	intel_private.base.gtt_total_entries = intel_gtt_total_entries();



	dev_info(&intel_private.bridge_dev->dev,

			"detected gtt size: %dK total, %dK mappable\n",

			intel_private.base.gtt_total_entries * 4,

			intel_private.base.gtt_mappable_entries * 4);



	gtt_map_size = intel_private.base.gtt_total_entries * 4;



	intel_private.gtt = ioremap(intel_private.gtt_bus_addr,

drivers/gpu/drm/i915/i915_dma.c

+0 −1
Original line number Diff line number Diff line
@@ -1200,7 +1200,6 @@ static int i915_load_modeset_init(struct drm_device *dev, 


	/* Basic memrange allocator for stolen space (aka mm.vram) */

	drm_mm_init(&dev_priv->mm.vram, 0, prealloc_size);

	DRM_INFO("set up %ldM of stolen space\n", prealloc_size / (1024*1024));



	/* We're off and running w/KMS */

	dev_priv->mm.suspended = 0;

include/drm/intel-gtt.h

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 


#ifndef _DRM_INTEL_GTT_H

#define	_DRM_INTEL_GTT_H

extern int intel_max_stolen; /* from AGP driver */



struct intel_gtt {

	/* Number of stolen gtt entries at the beginning. */

	unsigned int gtt_stolen_entries;