Skip to contentSkip to conversation

drm/i915/gvt: i915_gem_object_create() returns error pointers

PATCH New Dan Carpenter 1 participant 1 message Oct 20, 2016

Subsystems (4)
DRM drivers Intel i915 Kernel janitors Intel GVT-g drivers (Intel GPU Virtualization)
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 drm/i915/gvt: i915_gem_object_create() returns error pointers

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 <[email protected]>

---
The error handling in perform_bb_shadow() is a bit leaky as well.

drivers/gpu/drm/i915/gvt/cmd_parser.c +4 -4
index 5808ee7c1935..6abb2a679a3f 100644
@@ -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)