From: Dan Carpenter <dan.carpsnter@oracle.com>
To: Daniel Vetter <daniel.vetter@intel.com>, Zhi Wang <zhi.a.wang@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>,
David Airlie <airlied@linux.ie>,
Zhenyu Wang <zhenyuw@linux.intel.com>,
Yulei Zhang <yulei.zhang@intel.com>,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
kernel-janitors@vger.kernel.org
Subject: [patch] drm/i915/gvt: i915_gem_object_create() returns error pointers
Date: Thu, 20 Oct 2016 14:44:00 +0300 [thread overview]
Message-ID: <20161020114400.GA15071@elgon.mountain> (raw)
The i915_gem_object_create() returns error pointers on error, it never
returns NULLs.
Fixes: ("drm/i915/gvt: vGPU command scanner")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
The error handling in perform_bb_shadow() is a bit leaky as well.
diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c
index 5808ee7c1935..6abb2a679a3f 100644
--- a/drivers/gpu/drm/i915/gvt/cmd_parser.c
+++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c
@@ -1640,8 +1640,8 @@ static int perform_bb_shadow(struct parser_exec_state *s)
entry_obj->obj = i915_gem_object_create(&(s->vgpu->gvt->dev_priv->drm),
round_up(bb_size, PAGE_SIZE));
- if (entry_obj->obj == NULL)
- return -ENOMEM;
+ if (IS_ERR(entry_obj->obj))
+ return PTR_ERR(entry_obj->obj);
entry_obj->len = bb_size;
INIT_LIST_HEAD(&entry_obj->list);
@@ -2712,8 +2712,8 @@ static int shadow_indirect_ctx(struct intel_shadow_wa_ctx *wa_ctx)
wa_ctx->indirect_ctx.obj = i915_gem_object_create(dev,
round_up(ctx_size + CACHELINE_BYTES, PAGE_SIZE));
- if (wa_ctx->indirect_ctx.obj == NULL)
- return -ENOMEM;
+ if (IS_ERR(wa_ctx->indirect_ctx.obj))
+ return PTR_ERR(wa_ctx->indirect_ctx.obj);
ret = i915_gem_object_get_pages(wa_ctx->indirect_ctx.obj);
if (ret)
reply other threads:[~2016-10-20 11:44 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20161020114400.GA15071@elgon.mountain \
--to=dan.carpsnter@oracle.com \
--cc=airlied@linux.ie \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=yulei.zhang@intel.com \
--cc=zhenyuw@linux.intel.com \
--cc=zhi.a.wang@intel.com \
/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