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

Commit e3895af8 authored by Michel Thierry's avatar Michel Thierry Committed by Chris Wilson
Browse files

drm/i915: Rename gen8_(un)request_engine_reset to gen8_reset_engine_start/cancel 



As all other functions related to resetting engines are using
reset_engine.

v2: remove _request_ and use start/cancel instead (Chris)

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarMichel Thierry <michel.thierry@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170418202335.35232-3-michel.thierry@intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 56306c6e

drivers/gpu/drm/i915/intel_uncore.c

+4 −4
Original line number Diff line number Diff line
@@ -1683,7 +1683,7 @@ int intel_wait_for_register(struct drm_i915_private *dev_priv, 
	return ret;

}



static int gen8_request_engine_reset(struct intel_engine_cs *engine)

static int gen8_reset_engine_start(struct intel_engine_cs *engine)

{

	struct drm_i915_private *dev_priv = engine->i915;

	int ret;
@@ -1702,7 +1702,7 @@ static int gen8_request_engine_reset(struct intel_engine_cs *engine) 
	return ret;

}



static void gen8_unrequest_engine_reset(struct intel_engine_cs *engine)

static void gen8_reset_engine_cancel(struct intel_engine_cs *engine)

{

	struct drm_i915_private *dev_priv = engine->i915;
@@ -1717,14 +1717,14 @@ static int gen8_reset_engines(struct drm_i915_private *dev_priv, 
	unsigned int tmp;



	for_each_engine_masked(engine, dev_priv, engine_mask, tmp)

		if (gen8_request_engine_reset(engine))

		if (gen8_reset_engine_start(engine))

			goto not_ready;



	return gen6_reset_engines(dev_priv, engine_mask);



not_ready:

	for_each_engine_masked(engine, dev_priv, engine_mask, tmp)

		gen8_unrequest_engine_reset(engine);

		gen8_reset_engine_cancel(engine);



	return -EIO;

}