From: Dave Gordon <david.s.gordon@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH v5 04/11] drm/i915: tidy up initialisation failure paths (GEM)
Date: Fri, 5 Feb 2016 18:33:41 +0000 [thread overview]
Message-ID: <1454697228-33164-5-git-send-email-david.s.gordon@intel.com> (raw)
In-Reply-To: <1454697228-33164-1-git-send-email-david.s.gordon@intel.com>
Add call to i915_gem_context_fini() to deallocate the default context
if the call to init_rings() fails, so that we don't leak the allocated
memory in that situation.
Signed-off-by: Dave Gordon <david.s.gordon@intel.com>
---
drivers/gpu/drm/i915/i915_gem.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index e9b19bc..2bd5b5f 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4987,8 +4987,11 @@ int i915_gem_init(struct drm_device *dev)
goto out_unlock;
ret = dev_priv->gt.init_rings(dev);
- if (ret)
+ if (ret) {
+ i915_gem_context_fini(dev);
+ /* XXX: anything else to be undone here? */
goto out_unlock;
+ }
ret = i915_gem_init_hw(dev);
if (ret == -EIO) {
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-02-05 18:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-05 18:33 [PATCH v5 00/11] A collection of cleanups, revisited Dave Gordon
2016-02-05 18:33 ` [PATCH v5 01/11] drm/i915: unmap the correct page in intel_logical_ring_cleanup() Dave Gordon
2016-02-05 18:33 ` [PATCH v5 02/11] drm/i915: consolidate LRC mode HWSP setup & teardown Dave Gordon
2016-02-05 18:33 ` [PATCH v5 03/11] drm/i915: remove useless copypasted code Dave Gordon
2016-02-05 18:33 ` Dave Gordon [this message]
2016-02-05 18:33 ` [PATCH v5 05/11] drm/i915: tidy initialisation failure paths (legacy, part 1) Dave Gordon
2016-02-05 18:33 ` [PATCH v5 06/11] drm/i915: tidy initialisation failure paths (legacy, part 2) Dave Gordon
2016-02-05 18:33 ` [PATCH v5 07/11] drm/i915: tidy initialisation failure paths (legacy, part 3) Dave Gordon
2016-02-05 18:33 ` [PATCH v5 08/11] drm/i915: two small moves towards more consistency Dave Gordon
2016-02-05 18:33 ` [PATCH v5 09/11] drm/i915: tear down hardware status page mappings earlier Dave Gordon
2016-02-05 18:33 ` [PATCH v5 10/11] drm/i915: interchange context/engine cleanup order Dave Gordon
2016-02-05 18:33 ` [PATCH v5 11/11] drm/i915: make LRC status page teardown code a bit more robust Dave Gordon
2016-02-08 12:58 ` ✓ Fi.CI.BAT: success for A collection of cleanups, revisited 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=1454697228-33164-5-git-send-email-david.s.gordon@intel.com \
--to=david.s.gordon@intel.com \
--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;
as well as URLs for NNTP newsgroup(s).