aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h2
-rw-r--r--drivers/gpu/drm/i915/i915_gem_gtt.c2
-rw-r--r--drivers/gpu/drm/i915/i915_gem_stolen.c4
3 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 0509fd086130..40ae9425da3c 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3339,7 +3339,7 @@ int i915_gem_stolen_insert_node_in_range(struct drm_i915_private *dev_priv,
3339void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv, 3339void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv,
3340 struct drm_mm_node *node); 3340 struct drm_mm_node *node);
3341int i915_gem_init_stolen(struct drm_i915_private *dev_priv); 3341int i915_gem_init_stolen(struct drm_i915_private *dev_priv);
3342void i915_gem_cleanup_stolen(struct drm_device *dev); 3342void i915_gem_cleanup_stolen(struct drm_i915_private *dev_priv);
3343struct drm_i915_gem_object * 3343struct drm_i915_gem_object *
3344i915_gem_object_create_stolen(struct drm_i915_private *dev_priv, 3344i915_gem_object_create_stolen(struct drm_i915_private *dev_priv,
3345 resource_size_t size); 3345 resource_size_t size);
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 4877d4d582c2..56c7f8637311 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -3005,7 +3005,7 @@ void i915_ggtt_cleanup_hw(struct drm_i915_private *dev_priv)
3005 arch_phys_wc_del(ggtt->mtrr); 3005 arch_phys_wc_del(ggtt->mtrr);
3006 io_mapping_fini(&ggtt->iomap); 3006 io_mapping_fini(&ggtt->iomap);
3007 3007
3008 i915_gem_cleanup_stolen(&dev_priv->drm); 3008 i915_gem_cleanup_stolen(dev_priv);
3009} 3009}
3010 3010
3011static unsigned int gen6_get_total_gtt_size(u16 snb_gmch_ctl) 3011static unsigned int gen6_get_total_gtt_size(u16 snb_gmch_ctl)
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index 53440bf87650..f29a7ff7c362 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -167,10 +167,8 @@ static int i915_adjust_stolen(struct drm_i915_private *dev_priv,
167 return 0; 167 return 0;
168} 168}
169 169
170void i915_gem_cleanup_stolen(struct drm_device *dev) 170void i915_gem_cleanup_stolen(struct drm_i915_private *dev_priv)
171{ 171{
172 struct drm_i915_private *dev_priv = to_i915(dev);
173
174 if (!drm_mm_initialized(&dev_priv->mm.stolen)) 172 if (!drm_mm_initialized(&dev_priv->mm.stolen))
175 return; 173 return;
176 174