diff options
| author | Tvrtko Ursulin | 2017-02-16 13:23:22 +0100 |
|---|---|---|
| committer | Tvrtko Ursulin | 2017-02-17 12:39:59 +0100 |
| commit | 8ee7c6e23bb1b3c37ef27e81395db056bd7eac53 (patch) | |
| tree | 534610a1b460eb836d646d1949c4cefbb5a482db /drivers/gpu/drm/i915/intel_engine_cs.c | |
| parent | drm/i915: Make int __intel_ring_space static (diff) | |
| download | kernel-qcow2-linux-8ee7c6e23bb1b3c37ef27e81395db056bd7eac53.tar.gz kernel-qcow2-linux-8ee7c6e23bb1b3c37ef27e81395db056bd7eac53.tar.xz kernel-qcow2-linux-8ee7c6e23bb1b3c37ef27e81395db056bd7eac53.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_engine_cs.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_engine_cs.c | 4 |
1 files changed, 1 insertions, 3 deletions
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; } |