Commit 9dfe3459 authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Chris Wilson
Browse files

drm/i915/gt: Introduce intel_gt_runtime_suspend/resume 



To be called from the top level runtime functions, to hide the
gt-specific bits (mainly related to intel_uc).

v2: rebased

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: 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/20190801005709.34092-3-daniele.ceraolospurio@intel.com
parent 6f76098f

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

+12 −0
Original line number Diff line number Diff line
@@ -164,3 +164,15 @@ int intel_gt_resume(struct intel_gt *gt) 


	return err;

}



void intel_gt_runtime_suspend(struct intel_gt *gt)

{

	intel_uc_runtime_suspend(&gt->uc);

}



int intel_gt_runtime_resume(struct intel_gt *gt)

{

	intel_gt_init_swizzling(gt);



	return intel_uc_runtime_resume(&gt->uc);

}

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

+2 −0
Original line number Diff line number Diff line
@@ -23,5 +23,7 @@ void intel_gt_pm_init_early(struct intel_gt *gt); 


void intel_gt_sanitize(struct intel_gt *gt, bool force);

int intel_gt_resume(struct intel_gt *gt);

void intel_gt_runtime_suspend(struct intel_gt *gt);

int intel_gt_runtime_resume(struct intel_gt *gt);



#endif /* INTEL_GT_PM_H */

drivers/gpu/drm/i915/i915_drv.c

+3 −6
Original line number Diff line number Diff line
@@ -2925,7 +2925,7 @@ static int intel_runtime_suspend(struct device *kdev) 
	 */

	i915_gem_runtime_suspend(dev_priv);



	intel_uc_runtime_suspend(&dev_priv->gt.uc);

	intel_gt_runtime_suspend(&dev_priv->gt);



	intel_runtime_pm_disable_interrupts(dev_priv);
@@ -2950,9 +2950,8 @@ static int intel_runtime_suspend(struct device *kdev) 


		intel_runtime_pm_enable_interrupts(dev_priv);



		intel_uc_runtime_resume(&dev_priv->gt.uc);

		intel_gt_runtime_resume(&dev_priv->gt);



		intel_gt_init_swizzling(&dev_priv->gt);

		i915_gem_restore_fences(dev_priv);



		enable_rpm_wakeref_asserts(rpm);
@@ -3047,13 +3046,11 @@ static int intel_runtime_resume(struct device *kdev) 


	intel_runtime_pm_enable_interrupts(dev_priv);



	intel_uc_runtime_resume(&dev_priv->gt.uc);



	/*

	 * No point of rolling back things in case of an error, as the best

	 * we can do is to hope that things will still work (and disable RPM).

	 */

	intel_gt_init_swizzling(&dev_priv->gt);

	intel_gt_runtime_resume(&dev_priv->gt);

	i915_gem_restore_fences(dev_priv);



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE