| Message ID | 20170325013010.36244-3-michel.thierry@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Mar 24, 2017 at 06:29:54PM -0700, Michel Thierry wrote:
> As all other functions related to resetting engines are using reset_engine.
However, we should aim to clear any confusion between this and our
requests. Maybe gen8_reset_engine_start and gen8_reset_engine_cancel?
I think gen8_reset_engine_foo is clearer.
-Chris
On 25/03/17 02:01, Chris Wilson wrote: > On Fri, Mar 24, 2017 at 06:29:54PM -0700, Michel Thierry wrote: >> As all other functions related to resetting engines are using reset_engine. > > However, we should aim to clear any confusion between this and our > requests. Maybe gen8_reset_engine_start and gen8_reset_engine_cancel? > I think gen8_reset_engine_foo is clearer. gen8_reset_engine_start & gen8_reset_engine_cancel sound good to me. Thanks
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index 6d1ea26b2493..5f815a100a8d 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -1658,7 +1658,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_request_reset_engine(struct intel_engine_cs *engine) { struct drm_i915_private *dev_priv = engine->i915; int ret; @@ -1677,7 +1677,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_unrequest_reset_engine(struct intel_engine_cs *engine) { struct drm_i915_private *dev_priv = engine->i915; @@ -1692,14 +1692,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_request_reset_engine(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_unrequest_reset_engine(engine); return -EIO; }
As all other functions related to resetting engines are using reset_engine. Signed-off-by: Michel Thierry <michel.thierry@intel.com> --- drivers/gpu/drm/i915/intel_uncore.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)