[PATCH 3/3] drm/i915: Simplify cleanup path in intel_engines_init

Tvrtko Ursulin
2017-02-15T14:06:22Z

We can call the engine cleanup vfunc instead of duplicating the
decision making here.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/intel_engine_cs.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index afaedc3adc2e..1f4d5d910455 100644
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -210,10 +210,8 @@ int intel_engines_init(struct drm_i915_private *dev_priv)
for_each_engine(engine, dev_priv, id) {
if (id >= err_id)
kfree(engine);
- else if (i915.enable_execlists)
- intel_logical_ring_cleanup(engine);
else
- intel_engine_cleanup(engine);
+ dev_priv->gt.cleanup_engine(engine);
}
return err;
}