From: Tvrtko Ursulin <tursulin@ursulin.net>
To: Intel-gfx@lists.freedesktop.org
Subject: [PATCH 3/3] drm/i915: Simplify cleanup path in intel_engines_init
Date: Wed, 15 Feb 2017 14:05:53 +0000 [thread overview]
Message-ID: <20170215140553.28751-4-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <20170215140553.28751-1-tvrtko.ursulin@linux.intel.com>
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
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;
}
--
2.9.3
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-02-15 14:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-15 14:05 [PATCH 0/3] Moving the common engine/ring code to intel_engine_cs.c Tvrtko Ursulin
2017-02-15 14:05 ` [PATCH 1/3] drm/i915: Make int __intel_ring_space static Tvrtko Ursulin
2017-02-15 14:05 ` [PATCH 2/3] drm/i915: Move common engine and ring code into intel_engine_cs Tvrtko Ursulin
2017-02-15 14:18 ` Chris Wilson
2017-02-15 15:54 ` [PATCH 2/3] drm/i915: Move common workaround code to intel_engine_cs Tvrtko Ursulin
2017-02-15 14:18 ` [PATCH 2/3] drm/i915: Move common engine and ring code into intel_engine_cs Ville Syrjälä
2017-02-15 14:05 ` Tvrtko Ursulin [this message]
2017-02-15 18:23 ` ✗ Fi.CI.BAT: failure for Moving the common engine/ring code to intel_engine_cs.c (rev2) Patchwork
2017-02-16 12:44 ` ✓ Fi.CI.BAT: success " Patchwork
2017-02-16 16:52 ` Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170215140553.28751-4-tvrtko.ursulin@linux.intel.com \
--to=tursulin@ursulin.net \
--cc=Intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox