Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aba5e278 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Add a hook for making the engines idle (parking) and unparking 



In the next patch, we will want to install a callback when the engines
(GT as a whole) become idle and similarly when they first become busy.
To enable that callback, first rename intel_engines_mark_idle() to
intel_engines_park() and provide the companion intel_engines_unpark().

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171025143943.7661-2-chris@chris-wilson.co.uk
parent 43037c86

drivers/gpu/drm/i915/i915_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -3347,7 +3347,7 @@ i915_gem_idle_work_handler(struct work_struct *work) 
	if (!intel_engines_are_idle(dev_priv))

		DRM_ERROR("Timeout waiting for engines to idle\n");



	intel_engines_mark_idle(dev_priv);

	intel_engines_park(dev_priv);

	i915_gem_timelines_mark_idle(dev_priv);



	GEM_BUG_ON(!dev_priv->gt.awake);

drivers/gpu/drm/i915/i915_gem_request.c

+2 −0
Original line number Diff line number Diff line
@@ -259,6 +259,8 @@ static void mark_busy(struct drm_i915_private *i915) 
	if (INTEL_GEN(i915) >= 6)

		gen6_rps_busy(i915);



	intel_engines_unpark(i915);



	queue_delayed_work(i915->wq,

			   &i915->gt.retire_work,

			   round_jiffies_up_relative(HZ));

drivers/gpu/drm/i915/intel_engine_cs.c

+31 −2
Original line number Diff line number Diff line
@@ -1600,19 +1600,48 @@ void intel_engines_reset_default_submission(struct drm_i915_private *i915) 
		engine->set_default_submission(engine);

}



void intel_engines_mark_idle(struct drm_i915_private *i915)

/**

 * intel_engines_park: called when the GT is transitioning from busy->idle

 * @i915: the i915 device

 *

 * The GT is now idle and about to go to sleep (maybe never to wake again?).

 * Time for us to tidy and put away our toys (release resources back to the

 * system).

 */

void intel_engines_park(struct drm_i915_private *i915)

{

	struct intel_engine_cs *engine;

	enum intel_engine_id id;



	for_each_engine(engine, i915, id) {

		if (engine->park)

			engine->park(engine);



		intel_engine_disarm_breadcrumbs(engine);

		i915_gem_batch_pool_fini(&engine->batch_pool);

		tasklet_kill(&engine->execlists.irq_tasklet);



		i915_gem_batch_pool_fini(&engine->batch_pool);

		engine->execlists.no_priolist = false;

	}

}



/**

 * intel_engines_unpark: called when the GT is transitioning from idle->busy

 * @i915: the i915 device

 *

 * The GT was idle and now about to fire up with some new user requests.

 */

void intel_engines_unpark(struct drm_i915_private *i915)

{

	struct intel_engine_cs *engine;

	enum intel_engine_id id;



	for_each_engine(engine, i915, id) {

		if (engine->unpark)

			engine->unpark(engine);

	}

}



bool intel_engine_can_store_dword(struct intel_engine_cs *engine)

{

	switch (INTEL_GEN(engine->i915)) {

drivers/gpu/drm/i915/intel_lrc.c

+3 −0
Original line number Diff line number Diff line
@@ -1891,6 +1891,9 @@ static void execlists_set_default_submission(struct intel_engine_cs *engine) 
	engine->cancel_requests = execlists_cancel_requests;

	engine->schedule = execlists_schedule;

	engine->execlists.irq_tasklet.func = intel_lrc_irq_handler;



	engine->park = NULL;

	engine->unpark = NULL;

}



static void

drivers/gpu/drm/i915/intel_ringbuffer.c

+4 −1
Original line number Diff line number Diff line
@@ -2028,12 +2028,15 @@ static void i9xx_set_default_submission(struct intel_engine_cs *engine) 
{

	engine->submit_request = i9xx_submit_request;

	engine->cancel_requests = cancel_requests;



	engine->park = NULL;

	engine->unpark = NULL;

}



static void gen6_bsd_set_default_submission(struct intel_engine_cs *engine)

{

	i9xx_set_default_submission(engine);

	engine->submit_request = gen6_bsd_submit_request;

	engine->cancel_requests = cancel_requests;

}



static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv,