Browse Source

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 <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Tvrtko Ursulin 8 years ago
parent
commit
8ee7c6e23b
1 changed files with 1 additions and 3 deletions
  1. 1 3
      drivers/gpu/drm/i915/intel_engine_cs.c

+ 1 - 3
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;
 }