aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/i915/i915_debugfs.c3
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h1
-rw-r--r--drivers/gpu/drm/i915/i915_gem_gtt.c1
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index f94418bd1ed2..35d326d70fab 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -259,7 +259,8 @@ static int i915_gem_object_info(struct seq_file *m, void* data)
259 count, size); 259 count, size);
260 260
261 seq_printf(m, "%zu [%zu] gtt total\n", 261 seq_printf(m, "%zu [%zu] gtt total\n",
262 dev_priv->mm.gtt_total, dev_priv->mm.mappable_gtt_total); 262 dev_priv->mm.gtt_total,
263 dev_priv->mm.gtt_mappable_end - dev_priv->mm.gtt_start);
263 264
264 mutex_unlock(&dev->struct_mutex); 265 mutex_unlock(&dev->struct_mutex);
265 266
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index d58189e60844..6e2c10b65c8d 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -886,7 +886,6 @@ typedef struct drm_i915_private {
886 886
887 /* accounting, useful for userland debugging */ 887 /* accounting, useful for userland debugging */
888 size_t gtt_total; 888 size_t gtt_total;
889 size_t mappable_gtt_total;
890 size_t object_memory; 889 size_t object_memory;
891 u32 object_count; 890 u32 object_count;
892 } mm; 891 } mm;
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index e66c70008767..8c42ddd467b6 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -559,7 +559,6 @@ void i915_gem_setup_global_gtt(struct drm_device *dev,
559 dev_priv->mm.gtt_start = start; 559 dev_priv->mm.gtt_start = start;
560 dev_priv->mm.gtt_mappable_end = mappable_end; 560 dev_priv->mm.gtt_mappable_end = mappable_end;
561 dev_priv->mm.gtt_total = end - start; 561 dev_priv->mm.gtt_total = end - start;
562 dev_priv->mm.mappable_gtt_total = mappable_end - start;
563 562
564 /* Clear any non-preallocated blocks */ 563 /* Clear any non-preallocated blocks */
565 drm_mm_for_each_hole(entry, &dev_priv->mm.gtt_space, 564 drm_mm_for_each_hole(entry, &dev_priv->mm.gtt_space,