|
@@ -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;
|
|
|
}
|