Commit 6cf72db6 authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Chris Wilson
Browse files

drm/i915/gt: Move gt_cleanup_early out of gem_cleanup_early 



We don't call the init_early function from within the gem code, so we
shouldn't do it for the cleanup either.

v2: while at it, s/gt_cleanup_early/gt_late_release (Chris)
v3: s/late_release/driver_late_release/ (Chris)

Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> #v1
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/20190801005709.34092-1-daniele.ceraolospurio@intel.com
parent a1c9ca22

drivers/gpu/drm/i915/gt/intel_gt.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ void intel_gt_fini_scratch(struct intel_gt *gt) 
	i915_vma_unpin_and_release(&gt->scratch, 0);

}



void intel_gt_cleanup_early(struct intel_gt *gt)

void intel_gt_driver_late_release(struct intel_gt *gt)

{

	intel_gt_fini_reset(gt);

}

drivers/gpu/drm/i915/gt/intel_gt.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static inline struct intel_gt *huc_to_gt(struct intel_huc *huc) 
void intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915);

void intel_gt_init_hw(struct drm_i915_private *i915);



void intel_gt_cleanup_early(struct intel_gt *gt);

void intel_gt_driver_late_release(struct intel_gt *gt);



void intel_gt_check_and_clear_faults(struct intel_gt *gt);

void intel_gt_clear_error_registers(struct intel_gt *gt,

drivers/gpu/drm/i915/i915_drv.c

+2 −0
Original line number Diff line number Diff line
@@ -951,6 +951,7 @@ err_uc: 
	intel_uc_cleanup_early(&dev_priv->gt.uc);

	i915_gem_cleanup_early(dev_priv);

err_workqueues:

	intel_gt_driver_late_release(&dev_priv->gt);

	i915_workqueues_cleanup(dev_priv);

	return ret;

}
@@ -966,6 +967,7 @@ static void i915_driver_late_release(struct drm_i915_private *dev_priv) 
	intel_power_domains_cleanup(dev_priv);

	intel_uc_cleanup_early(&dev_priv->gt.uc);

	i915_gem_cleanup_early(dev_priv);

	intel_gt_driver_late_release(&dev_priv->gt);

	i915_workqueues_cleanup(dev_priv);



	pm_qos_remove_request(&dev_priv->sb_qos);

drivers/gpu/drm/i915/i915_gem.c

+0 −2
Original line number Diff line number Diff line
@@ -1689,8 +1689,6 @@ void i915_gem_cleanup_early(struct drm_i915_private *dev_priv) 
	GEM_BUG_ON(atomic_read(&dev_priv->mm.free_count));

	WARN_ON(dev_priv->mm.shrink_count);



	intel_gt_cleanup_early(&dev_priv->gt);



	i915_gemfs_fini(dev_priv);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE