evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

intel-gtt: clean up gtt size reporting

Browse source 
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>
This commit is contained in:
Daniel Vetter 2010-09-12 14:04:03 +02:00 • committed by Chris Wilson
parent aaa6259119
commit 0af9e92e77
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/char/agp/intel-gtt.c
View file

@ -41,7 +41,6 @@
/* Max amount of stolen space, anything above will be returned to Linux */ /* Max amount of stolen space, anything above will be returned to Linux */
int intel_max_stolen = 32 * 1024 * 1024; int intel_max_stolen = 32 * 1024 * 1024;
EXPORT_SYMBOL(intel_max_stolen);
static const struct aper_size_info_fixed intel_i810_sizes[] = 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_mappable_entries = intel_gtt_mappable_entries();
intel_private.base.gtt_total_entries = intel_gtt_total_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; gtt_map_size = intel_private.base.gtt_total_entries * 4;
intel_private.gtt = ioremap(intel_private.gtt_bus_addr, intel_private.gtt = ioremap(intel_private.gtt_bus_addr,

1
drivers/gpu/drm/i915/i915_dma.c
View file

@ -1200,7 +1200,6 @@ static int i915_load_modeset_init(struct drm_device *dev,
/* Basic memrange allocator for stolen space (aka mm.vram) */ /* Basic memrange allocator for stolen space (aka mm.vram) */
drm_mm_init(&dev_priv->mm.vram, 0, prealloc_size); 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 */ /* We're off and running w/KMS */
dev_priv->mm.suspended = 0; dev_priv->mm.suspended = 0;

2
include/drm/intel-gtt.h
View file

@ -2,8 +2,6 @@
#ifndef _DRM_INTEL_GTT_H #ifndef _DRM_INTEL_GTT_H
#define _DRM_INTEL_GTT_H #define _DRM_INTEL_GTT_H
extern int intel_max_stolen; /* from AGP driver */
struct intel_gtt { struct intel_gtt {
/* Number of stolen gtt entries at the beginning. */ /* Number of stolen gtt entries at the beginning. */
unsigned int gtt_stolen_entries; unsigned int gtt_stolen_entries;