aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2013-01-17 15:45:12 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-01-17 16:27:31 -0500
commitc1fc6521efbed7d3aca4e37ac61b23300f161cd1 (patch)
tree076241af78c875a4e0721fe946d24fde87e5be69
parentc70af1e4b60a1853feeaae2bf6e2aa98de68acd9 (diff)
drm/i915: Kill gtt_end
It's duplicated in the more useful gtt_total. Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h1
-rw-r--r--drivers/gpu/drm/i915/i915_gem_gtt.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 8f5b2816fc03..d58189e60844 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -801,7 +801,6 @@ typedef struct drm_i915_private {
801 /** Usable portion of the GTT for GEM */ 801 /** Usable portion of the GTT for GEM */
802 unsigned long gtt_start; 802 unsigned long gtt_start;
803 unsigned long gtt_mappable_end; 803 unsigned long gtt_mappable_end;
804 unsigned long gtt_end;
805 unsigned long stolen_base; /* limited to low memory (32-bit) */ 804 unsigned long stolen_base; /* limited to low memory (32-bit) */
806 805
807 /** "Graphics Stolen Memory" holds the global PTEs */ 806 /** "Graphics Stolen Memory" holds the global PTEs */
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index a4af0f79e972..3ffcf528f166 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -394,7 +394,7 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev)
394 394
395 /* First fill our portion of the GTT with scratch pages */ 395 /* First fill our portion of the GTT with scratch pages */
396 i915_ggtt_clear_range(dev, dev_priv->mm.gtt_start / PAGE_SIZE, 396 i915_ggtt_clear_range(dev, dev_priv->mm.gtt_start / PAGE_SIZE,
397 (dev_priv->mm.gtt_end - dev_priv->mm.gtt_start) / PAGE_SIZE); 397 dev_priv->mm.gtt_total / PAGE_SIZE);
398 398
399 list_for_each_entry(obj, &dev_priv->mm.bound_list, gtt_list) { 399 list_for_each_entry(obj, &dev_priv->mm.bound_list, gtt_list) {
400 i915_gem_clflush_object(obj); 400 i915_gem_clflush_object(obj);
@@ -556,7 +556,6 @@ void i915_gem_setup_global_gtt(struct drm_device *dev,
556 556
557 dev_priv->mm.gtt_start = start; 557 dev_priv->mm.gtt_start = start;
558 dev_priv->mm.gtt_mappable_end = mappable_end; 558 dev_priv->mm.gtt_mappable_end = mappable_end;
559 dev_priv->mm.gtt_end = end;
560 dev_priv->mm.gtt_total = end - start; 559 dev_priv->mm.gtt_total = end - start;
561 dev_priv->mm.mappable_gtt_total = min(end, mappable_end) - start; 560 dev_priv->mm.mappable_gtt_total = min(end, mappable_end) - start;
562 561