Commit 8c01903c authored by Matthew Auld's avatar Matthew Auld Committed by Chris Wilson
Browse files

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: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180920142707.19659-2-matthew.auld@intel.com
parent c6d22ab6

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -3339,7 +3339,7 @@ int i915_gem_stolen_insert_node_in_range(struct drm_i915_private *dev_priv, 
void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv,

				 struct drm_mm_node *node);

int i915_gem_init_stolen(struct drm_i915_private *dev_priv);

void i915_gem_cleanup_stolen(struct drm_device *dev);

void i915_gem_cleanup_stolen(struct drm_i915_private *dev_priv);

struct drm_i915_gem_object *

i915_gem_object_create_stolen(struct drm_i915_private *dev_priv,

			      resource_size_t size);

drivers/gpu/drm/i915/i915_gem_gtt.c

+1 −1
Original line number Diff line number Diff line
@@ -3005,7 +3005,7 @@ void i915_ggtt_cleanup_hw(struct drm_i915_private *dev_priv) 
	arch_phys_wc_del(ggtt->mtrr);

	io_mapping_fini(&ggtt->iomap);



	i915_gem_cleanup_stolen(&dev_priv->drm);

	i915_gem_cleanup_stolen(dev_priv);

}



static unsigned int gen6_get_total_gtt_size(u16 snb_gmch_ctl)

drivers/gpu/drm/i915/i915_gem_stolen.c

+1 −3
Original line number Diff line number Diff line
@@ -167,10 +167,8 @@ static int i915_adjust_stolen(struct drm_i915_private *dev_priv, 
	return 0;

}



void i915_gem_cleanup_stolen(struct drm_device *dev)

void i915_gem_cleanup_stolen(struct drm_i915_private *dev_priv)

{

	struct drm_i915_private *dev_priv = to_i915(dev);



	if (!drm_mm_initialized(&dev_priv->mm.stolen))

		return;

CRA Git | Maintained and supported by SUSTech CRA and CCSE