iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915/gvt: i915_gem_object_create() returns an error pointer

Browse Source 
On failure from i915_gem_object_create(), we need to check for an error
pointer not NULL.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
This commit is contained in:
Chris Wilson 2016-10-19 11:11:38 +01:00 committed by Zhenyu Wang
parent 75ea10da06
commit 894cf7d156
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/gpu/drm/i915/gvt/cmd_parser.c
View File

@ -1640,16 +1640,19 @@ static int perform_bb_shadow(struct parser_exec_state *s)
if (entry_obj == NULL) if (entry_obj == NULL)
return -ENOMEM; return -ENOMEM;
entry_obj->obj = i915_gem_object_create(&(s->vgpu->gvt->dev_priv->drm), entry_obj->obj =
round_up(bb_size, PAGE_SIZE)); i915_gem_object_create(&(s->vgpu->gvt->dev_priv->drm),
if (entry_obj->obj == NULL) roundup(bb_size, PAGE_SIZE));
return -ENOMEM; if (IS_ERR(entry_obj->obj)) {
ret = PTR_ERR(entry_obj->obj);
goto free_entry;
}
entry_obj->len = bb_size; entry_obj->len = bb_size;
INIT_LIST_HEAD(&entry_obj->list); INIT_LIST_HEAD(&entry_obj->list);
ret = i915_gem_object_get_pages(entry_obj->obj); ret = i915_gem_object_get_pages(entry_obj->obj);
if (ret) if (ret)
return ret; goto put_obj;
i915_gem_object_pin_pages(entry_obj->obj); i915_gem_object_pin_pages(entry_obj->obj);
@ -1675,7 +1678,7 @@ static int perform_bb_shadow(struct parser_exec_state *s)
gma, gma + bb_size, dst); gma, gma + bb_size, dst);
if (ret) { if (ret) {
gvt_err("fail to copy guest ring buffer\n"); gvt_err("fail to copy guest ring buffer\n");
return ret; goto unmap_src;
} }
list_add(&entry_obj->list, &s->workload->shadow_bb); list_add(&entry_obj->list, &s->workload->shadow_bb);
@ -1696,7 +1699,10 @@ unmap_src:
vunmap(dst); vunmap(dst);
unpin_src: unpin_src:
i915_gem_object_unpin_pages(entry_obj->obj); i915_gem_object_unpin_pages(entry_obj->obj);
put_obj:
i915_gem_object_put(entry_obj->obj);
free_entry:
kfree(entry_obj);
return ret; return ret;
} }
@ -2709,31 +2715,31 @@ static int shadow_indirect_ctx(struct intel_shadow_wa_ctx *wa_ctx)
struct drm_device *dev = &wa_ctx->workload->vgpu->gvt->dev_priv->drm; struct drm_device *dev = &wa_ctx->workload->vgpu->gvt->dev_priv->drm;
int ctx_size = wa_ctx->indirect_ctx.size; int ctx_size = wa_ctx->indirect_ctx.size;
unsigned long guest_gma = wa_ctx->indirect_ctx.guest_gma; unsigned long guest_gma = wa_ctx->indirect_ctx.guest_gma;
struct drm_i915_gem_object *obj;
int ret = 0; int ret = 0;
void *dest = NULL; void *dest = NULL;
wa_ctx->indirect_ctx.obj = i915_gem_object_create(dev, obj = i915_gem_object_create(dev,
round_up(ctx_size + CACHELINE_BYTES, PAGE_SIZE)); roundup(ctx_size + CACHELINE_BYTES,
if (wa_ctx->indirect_ctx.obj == NULL) PAGE_SIZE));
return -ENOMEM; if (IS_ERR(obj))
return PTR_ERR(obj);
ret = i915_gem_object_get_pages(wa_ctx->indirect_ctx.obj); ret = i915_gem_object_get_pages(obj);
if (ret) if (ret)
return ret; goto put_obj;
i915_gem_object_pin_pages(wa_ctx->indirect_ctx.obj); i915_gem_object_pin_pages(obj);
/* get the va of the shadow batch buffer */ /* get the va of the shadow batch buffer */
dest = (void *)vmap_batch(wa_ctx->indirect_ctx.obj, 0, dest = (void *)vmap_batch(obj, 0, ctx_size + CACHELINE_BYTES);
ctx_size + CACHELINE_BYTES);
if (!dest) { if (!dest) {
gvt_err("failed to vmap shadow indirect ctx\n"); gvt_err("failed to vmap shadow indirect ctx\n");
ret = -ENOMEM; ret = -ENOMEM;
goto unpin_src; goto unpin_src;
} }
ret = i915_gem_object_set_to_cpu_domain(wa_ctx->indirect_ctx.obj, ret = i915_gem_object_set_to_cpu_domain(obj, false);
false);
if (ret) { if (ret) {
gvt_err("failed to set shadow indirect ctx to CPU\n"); gvt_err("failed to set shadow indirect ctx to CPU\n");
goto unmap_src; goto unmap_src;
@ -2748,16 +2754,18 @@ static int shadow_indirect_ctx(struct intel_shadow_wa_ctx *wa_ctx)
guest_gma, guest_gma + ctx_size, dest); guest_gma, guest_gma + ctx_size, dest);
if (ret) { if (ret) {
gvt_err("fail to copy guest indirect ctx\n"); gvt_err("fail to copy guest indirect ctx\n");
return ret; goto unmap_src;
} }
wa_ctx->indirect_ctx.obj = obj;
return 0; return 0;
unmap_src: unmap_src:
vunmap(dest); vunmap(dest);
unpin_src: unpin_src:
i915_gem_object_unpin_pages(wa_ctx->indirect_ctx.obj); i915_gem_object_unpin_pages(wa_ctx->indirect_ctx.obj);
put_obj:
i915_gem_object_put(wa_ctx->indirect_ctx.obj);
return ret; return ret;
} }