From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: [PATCH 2/2] drm/i915: Return -ENOENT for unknown contexts Date: Fri, 14 Mar 2014 16:22:11 +0200 Message-ID: <1394806931-7399-2-git-send-email-mika.kuoppala@intel.com> References: <1394806931-7399-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 24024FB472 for ; Fri, 14 Mar 2014 07:22:54 -0700 (PDT) In-Reply-To: <1394806931-7399-1-git-send-email-mika.kuoppala@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org Cc: miku@iki.fi List-Id: intel-gfx@lists.freedesktop.org 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. 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 b5a5837..a8e625d 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -573,8 +573,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