Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915: pass dev_priv to i915_gem_cleanup_stolen

It really wants dev_priv anyway, also now matches i915_gem_init_stolen.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180920142707.19659-2-matthew.auld@intel.com

authored by

Matthew Auld and committed by
Chris Wilson
8c01903c c6d22ab6

+3 -5
+1 -1
drivers/gpu/drm/i915/i915_drv.h
··· 3339 3339 void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv, 3340 3340 struct drm_mm_node *node); 3341 3341 int i915_gem_init_stolen(struct drm_i915_private *dev_priv); 3342 - void i915_gem_cleanup_stolen(struct drm_device *dev); 3342 + void i915_gem_cleanup_stolen(struct drm_i915_private *dev_priv); 3343 3343 struct drm_i915_gem_object * 3344 3344 i915_gem_object_create_stolen(struct drm_i915_private *dev_priv, 3345 3345 resource_size_t size);
+1 -1
drivers/gpu/drm/i915/i915_gem_gtt.c
··· 3005 3005 arch_phys_wc_del(ggtt->mtrr); 3006 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 3011 3011 static unsigned int gen6_get_total_gtt_size(u16 snb_gmch_ctl)
+1 -3
drivers/gpu/drm/i915/i915_gem_stolen.c
··· 167 167 return 0; 168 168 } 169 169 170 - void i915_gem_cleanup_stolen(struct drm_device *dev) 170 + void i915_gem_cleanup_stolen(struct drm_i915_private *dev_priv) 171 171 { 172 - struct drm_i915_private *dev_priv = to_i915(dev); 173 - 174 172 if (!drm_mm_initialized(&dev_priv->mm.stolen)) 175 173 return; 176 174