From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH] drm/i915: bail in alloc_pdp when !FULL_48BIT_PPGTT
Date: Tue, 26 Apr 2016 10:08:07 +0100 [thread overview]
Message-ID: <1461661687-23888-1-git-send-email-matthew.auld@intel.com> (raw)
If we are not in FULL_48BIT_PPGTT mode then we really shouldn't
continue on with our allocations, given that the call to free_pdp would
bail early without freeing everything, thus leaking memory.
v2:
(Joonas Lahtinen)
- tidy up with goto teardown path
v3:
(Joonas Lahtinen)
- use more appropriate goto label name
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---
drivers/gpu/drm/i915/i915_gem_gtt.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 0d666b3..3ace3d0 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -567,13 +567,16 @@ static struct
i915_page_directory_pointer *alloc_pdp(struct drm_device *dev)
{
struct i915_page_directory_pointer *pdp;
- int ret = -ENOMEM;
+ int ret = -EINVAL;
- WARN_ON(!USES_FULL_48BIT_PPGTT(dev));
+ if (WARN_ON(!USES_FULL_48BIT_PPGTT(dev)))
+ goto fail;
pdp = kzalloc(sizeof(*pdp), GFP_KERNEL);
- if (!pdp)
- return ERR_PTR(-ENOMEM);
+ if (!pdp) {
+ ret = -ENOMEM;
+ goto fail;
+ }
ret = __pdp_init(dev, pdp);
if (ret)
@@ -589,7 +592,7 @@ fail_page_m:
__pdp_fini(pdp);
fail_bitmap:
kfree(pdp);
-
+fail:
return ERR_PTR(ret);
}
--
2.4.11
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2016-04-26 9:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-26 9:08 Matthew Auld [this message]
2016-04-26 9:31 ` [PATCH] drm/i915: bail in alloc_pdp when !FULL_48BIT_PPGTT Chris Wilson
2016-04-26 9:55 ` ✗ Fi.CI.BAT: failure for " 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=1461661687-23888-1-git-send-email-matthew.auld@intel.com \
--to=matthew.auld@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.