From: Mika Kuoppala Subject: [PATCH] drm/i915: Return -ENOENT for unknown contexts Date: Wed, 16 Apr 2014 11:58:09 +0300 Message-ID: <1397638689-9352-1-git-send-email-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 1FB166EA2E for ; Wed, 16 Apr 2014 01:58:10 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org From: Mika Kuoppala If hw_contexts are disabled, we always return the per file descriptor default context stats. Make sure that the context is correctly given and fail accordingly if not. Testcase: igt/gem_reset_stats/params Signed-off-by: Mika Kuoppala --- drivers/gpu/drm/i915/i915_gem_context.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 30b355a..85c890c 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -582,8 +582,12 @@ i915_gem_context_get(struct drm_i915_file_private *file_priv, u32 id) { struct i915_hw_context *ctx; - if (!HAS_HW_CONTEXTS(file_priv->dev_priv->dev)) + if (!HAS_HW_CONTEXTS(file_priv->dev_priv->dev)) { + if (id != DEFAULT_CONTEXT_ID) + return ERR_PTR(-ENOENT); + return file_priv->private_default_ctx; + } ctx = (struct i915_hw_context *)idr_find(&file_priv->context_idr, id); if (!ctx) -- 1.7.9.5