drm/i915: Move parking-while-active warning to intel_engines_park() (68027387) · Commits · 戴 / test

We will want to break this down to give detailed per-engine warnings as to why we still think we are active as we attempt to park the engines. For the first step, just move the warning verbatim from the idle-worker to intel_engines_park(). Signed-off-by:

Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20171027110617.31745-3-chris@chris-wilson.co.uk Reviewed-by:

Mika Kuoppala <mika.kuoppala@linux.intel.com>

drivers/gpu/drm/i915/i915_gem.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -3352,13 +3352,6 @@ i915_gem_idle_work_handler(struct work_struct *work)
		*/
		synchronize_irq(dev_priv->drm.irq);

		/*
		* We are committed now to parking the engines, make sure there
		* will be no more interrupts arriving later.
		*/
		if (!intel_engines_are_idle(dev_priv))
		DRM_ERROR("Timeout waiting for engines to idle\n");

		intel_engines_park(dev_priv);
		i915_gem_timelines_mark_idle(dev_priv);

drivers/gpu/drm/i915/intel_engine_cs.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -1613,6 +1613,13 @@ void intel_engines_park(struct drm_i915_private *i915)
		struct intel_engine_cs *engine;
		enum intel_engine_id id;

		/*
		* We are committed now to parking the engines, make sure there
		* will be no more interrupts arriving later.
		*/
		if (!intel_engines_are_idle(dev_priv))
		DRM_ERROR("Timeout waiting for engines to idle\n");

		for_each_engine(engine, i915, id) {
		if (engine->park)
		engine->park(engine);

Admin message