drm/i915: Remove gtt_mappable_total

With the assertion from the previous patch in place, it should be safe
to get rid gtt_mappable_total. Keeps things saner to not have to track
the same info in two places.

In order to keep the diff as simple as possible and keep with the
existing gtt_setup semantics we opt to keep gtt_mappable_end. It's not
as consistent with the 'total' used in the previous patch, but that can
be fixed later.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
[Ben modified commit message]
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index f94418bd1ed2efa12ce4df99eb169904f5cd29a3..35d326d70fabc4fb81e083328c6760380e917907 100644 (file)
--- 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)
                   count, size);
 
        seq_printf(m, "%zu [%zu] gtt total\n",
-                  dev_priv->mm.gtt_total, dev_priv->mm.mappable_gtt_total);
+                  dev_priv->mm.gtt_total,
+                  dev_priv->mm.gtt_mappable_end - dev_priv->mm.gtt_start);
 
        mutex_unlock(&dev->struct_mutex);
 

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index d58189e60844c34830ec0e5598df66ee90625b6e..6e2c10b65c8d2b8c936e4d9308b7e5f703ae110b 100644 (file)
--- 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 {
 
                /* accounting, useful for userland debugging */
                size_t gtt_total;
-               size_t mappable_gtt_total;
                size_t object_memory;
                u32 object_count;
        } mm;

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index e66c700087670a36093a77821b0718244cd4339e..8c42ddd467b6d68710d9624df8ed5cbd95d7cd9d 100644 (file)
--- 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,
        dev_priv->mm.gtt_start = start;
        dev_priv->mm.gtt_mappable_end = mappable_end;
        dev_priv->mm.gtt_total = end - start;
-       dev_priv->mm.mappable_gtt_total = mappable_end - start;
 
        /* Clear any non-preallocated blocks */
        drm_mm_for_each_hole(entry, &dev_priv->mm.gtt_space,