From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Date: Thu, 16 Feb 2017 12:23:22 +0000 (+0000)
Subject: drm/i915: Simplify cleanup path in intel_engines_init
X-Git-Tag: v4.13~831^2~34^2~182
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8ee7c6e23bb1b3c37ef27e81395db056bd7eac53;p=mirror_ubuntu-bionic-kernel.git

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>
---

diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index 538d845d7251..012ac9483491 100644
--- 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;
 }