From 05d86c0e397363629baebd2ff0ddc41464150c77 Mon Sep 17 00:00:00 2001 From: Jake Day Date: Tue, 5 Sep 2017 20:04:54 -0400 Subject: [PATCH] fix error handling for i915 --- kernel/drivers/gpu/drm/i915/intel_ipts.c | 3 ++- kernel/drivers/gpu/drm/i915/intel_lrc.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/drivers/gpu/drm/i915/intel_ipts.c b/kernel/drivers/gpu/drm/i915/intel_ipts.c index 64ad7ffdb..076085296 100644 --- a/kernel/drivers/gpu/drm/i915/intel_ipts.c +++ b/kernel/drivers/gpu/drm/i915/intel_ipts.c @@ -198,7 +198,8 @@ static int create_ipts_context(void) ret = execlists_context_pin(dev_priv->engine[RCS], ipts_ctx); if (IS_ERR(ret)) { - DRM_DEBUG("lr context pinning failed : %d\n", ret); + DRM_DEBUG("lr context pinning failed : %d\n", PTR_ERR(ret)); + ret = PTR_ERR(ret); goto err_ctx; } diff --git a/kernel/drivers/gpu/drm/i915/intel_lrc.c b/kernel/drivers/gpu/drm/i915/intel_lrc.c index bd90e2a29..652e31c09 100644 --- a/kernel/drivers/gpu/drm/i915/intel_lrc.c +++ b/kernel/drivers/gpu/drm/i915/intel_lrc.c @@ -211,8 +211,6 @@ #define WA_TAIL_DWORDS 2 -int execlists_context_deferred_alloc(struct i915_gem_context *ctx, - struct intel_engine_cs *engine); static void execlists_init_reg_state(u32 *reg_state, struct i915_gem_context *ctx, struct intel_engine_cs *engine,