Re: [PATCH -next] drm/i915/gvt: fix return value check

On 2016.10.19 16:18:03 +0000, Wei Yongjun wrote:

From: Wei Yongjun weiyongjun1@huawei.com

In case of error, the function i915_gem_object_create() returns ERR_PTR() not NULL. The NULL test in the return value check should be replaced with IS_ERR().

Signed-off-by: Wei Yongjun weiyongjun1@huawei.com

Hi, Yongjun, we've already had this fixed in our queue for next pull request, will send very soon.

Thanks.

---

drivers/gpu/drm/i915/gvt/cmd_parser.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c index 5808ee7..6abb2a6 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)