Commit 8649187a authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Move intel_engines_resume into common init 



Since this part still operates on i915 and not intel_gt, move it to the
common (top-level) function.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190621070811.7006-16-tvrtko.ursulin@linux.intel.com
parent abc584f9

drivers/gpu/drm/i915/i915_gem.c

+22 −7
Original line number Diff line number Diff line
@@ -1287,17 +1287,10 @@ static int init_hw(struct intel_gt *gt) 


	intel_mocs_init_l3cc_table(gt);



	/* Only when the HW is re-initialised, can we replay the requests */

	ret = intel_engines_resume(i915);

	if (ret)

		goto cleanup_uc;



	intel_uncore_forcewake_put(uncore, FORCEWAKE_ALL);



	return 0;



cleanup_uc:

	intel_uc_fini_hw(i915);

out:

	intel_uncore_forcewake_put(uncore, FORCEWAKE_ALL);
@@ -1306,6 +1299,7 @@ static int init_hw(struct intel_gt *gt) 


int i915_gem_init_hw(struct drm_i915_private *i915)

{

	struct intel_uncore *uncore = &i915->uncore;

	int ret;



	BUG_ON(!i915->kernel_context);
@@ -1313,7 +1307,28 @@ int i915_gem_init_hw(struct drm_i915_private *i915) 
	if (ret)

		return ret;



	/* Double layer security blanket, see i915_gem_init() */

	intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);



	ret = init_hw(&i915->gt);

	if (ret)

		goto err_init;



	/* Only when the HW is re-initialised, can we replay the requests */

	ret = intel_engines_resume(i915);

	if (ret)

		goto err_engines;



	intel_uncore_forcewake_put(uncore, FORCEWAKE_ALL);



	intel_engines_set_scheduler_caps(i915);



	return 0;



err_engines:

	intel_uc_fini_hw(i915);

err_init:

	intel_uncore_forcewake_put(uncore, FORCEWAKE_ALL);



	intel_engines_set_scheduler_caps(i915);