drm/i915: Simplify cleanup path in intel_engines_init

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

Signed-off-by: Tvrtko Ursulin <[email protected]>
Reviewed-by: Chris Wilson <[email protected]>

diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index 538d845d72513abf94013a9f5e8bd48336cfd7ed..012ac94834917a7b9457fdf1c22de4d3ba6c50df 100644 (file)
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -210,10 +210,8 @@ cleanup:
        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;
 }