Commit 3126a660 authored by Dan Carpenter's avatar Dan Carpenter Committed by Daniel Vetter

drm/i915: checking IS_ERR() instead of NULL

We switched from calling i915_gem_alloc_context_obj() to calling
i915_gem_alloc_object() so the error handling needs to be updated to
check for NULL instead of IS_ERR().

Fixes: 149c86e7 ('drm/i915: Allocate context objects from stolen')
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d4dc5e92
...@@ -1895,10 +1895,9 @@ int intel_lr_context_deferred_create(struct intel_context *ctx, ...@@ -1895,10 +1895,9 @@ int intel_lr_context_deferred_create(struct intel_context *ctx,
context_size = round_up(get_lr_context_size(ring), 4096); context_size = round_up(get_lr_context_size(ring), 4096);
ctx_obj = i915_gem_alloc_object(dev, context_size); ctx_obj = i915_gem_alloc_object(dev, context_size);
if (IS_ERR(ctx_obj)) { if (!ctx_obj) {
ret = PTR_ERR(ctx_obj); DRM_DEBUG_DRIVER("Alloc LRC backing obj failed.\n");
DRM_DEBUG_DRIVER("Alloc LRC backing obj failed: %d\n", ret); return -ENOMEM;
return ret;
} }
if (is_global_default_ctx) { if (is_global_default_ctx) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment