Commit 092be382 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Lift intel_engines_resume() to callers 



Since the reset path wants to recover the engines itself, it only wants
to reinitialise the hardware using i915_gem_init_hw(). Pull the call to
intel_engines_resume() to the module init/resume path so we can avoid it
during reset.

Fixes: 79ffac85 ("drm/i915: Invert the GEM wakeref hierarchy")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190626154549.10066-3-chris@chris-wilson.co.uk
parent 18398904

drivers/gpu/drm/i915/gem/i915_gem_pm.c

+4 −3
Original line number Diff line number Diff line
@@ -254,14 +254,15 @@ void i915_gem_resume(struct drm_i915_private *i915) 
	i915_gem_restore_gtt_mappings(i915);

	i915_gem_restore_fences(i915);



	if (i915_gem_init_hw(i915))

		goto err_wedged;



	/*

	 * As we didn't flush the kernel context before suspend, we cannot

	 * guarantee that the context image is complete. So let's just reset

	 * it and start again.

	 */

	intel_gt_resume(&i915->gt);



	if (i915_gem_init_hw(i915))

	if (intel_gt_resume(&i915->gt))

		goto err_wedged;



	intel_uc_resume(i915);

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

+0 −24
Original line number Diff line number Diff line
@@ -142,27 +142,3 @@ void intel_engine_init__pm(struct intel_engine_cs *engine) 
{

	intel_wakeref_init(&engine->wakeref);

}
 


int intel_engines_resume(struct drm_i915_private *i915)

{

	struct intel_engine_cs *engine;

	enum intel_engine_id id;

	int err = 0;



	intel_gt_pm_get(&i915->gt);

	for_each_engine(engine, i915, id) {

		intel_engine_pm_get(engine);

		engine->serial++; /* kernel context lost */

		err = engine->resume(engine);

		intel_engine_pm_put(engine);

		if (err) {

			dev_err(i915->drm.dev,

				"Failed to restart %s (%d)\n",

				engine->name, err);

			break;

		}

	}

	intel_gt_pm_put(&i915->gt);



	return err;

}

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

+0 −2
Original line number Diff line number Diff line
@@ -31,6 +31,4 @@ void intel_engine_park(struct intel_engine_cs *engine); 


void intel_engine_init__pm(struct intel_engine_cs *engine);



int intel_engines_resume(struct drm_i915_private *i915);



#endif /* INTEL_ENGINE_PM_H */

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

+20 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 */



#include "i915_drv.h"

#include "intel_engine_pm.h"

#include "intel_gt_pm.h"

#include "intel_pm.h"

#include "intel_wakeref.h"
@@ -122,10 +123,11 @@ void intel_gt_sanitize(struct intel_gt *gt, bool force) 
		intel_engine_reset(engine, false);

}



void intel_gt_resume(struct intel_gt *gt)

int intel_gt_resume(struct intel_gt *gt)

{

	struct intel_engine_cs *engine;

	enum intel_engine_id id;

	int err = 0;



	/*

	 * After resume, we may need to poke into the pinned kernel
@@ -133,9 +135,12 @@ void intel_gt_resume(struct intel_gt *gt) 
	 * Only the kernel contexts should remain pinned over suspend,

	 * allowing us to fixup the user contexts on their first pin.

	 */

	intel_gt_pm_get(gt);

	for_each_engine(engine, gt->i915, id) {

		struct intel_context *ce;



		intel_engine_pm_get(engine);



		ce = engine->kernel_context;

		if (ce)

			ce->ops->reset(ce);
@@ -143,5 +148,19 @@ void intel_gt_resume(struct intel_gt *gt) 
		ce = engine->preempt_context;

		if (ce)

			ce->ops->reset(ce);



		engine->serial++; /* kernel context lost */

		err = engine->resume(engine);



		intel_engine_pm_put(engine);

		if (err) {

			dev_err(gt->i915->drm.dev,

				"Failed to restart %s (%d)\n",

				engine->name, err);

			break;

		}

	}

	intel_gt_pm_put(gt);



	return err;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -22,6 +22,6 @@ void intel_gt_pm_put(struct intel_gt *gt); 
void intel_gt_pm_init_early(struct intel_gt *gt);



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

void intel_gt_resume(struct intel_gt *gt);

int intel_gt_resume(struct intel_gt *gt);



#endif /* INTEL_GT_PM_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE