From mboxrd@z Thu Jan 1 00:00:00 1970 From: oscar.mateo@intel.com Subject: [PATCH 31/50] drm/i915/bdw: Set the request context information correctly in the LRC case Date: Fri, 9 May 2014 13:09:01 +0100 Message-ID: <1399637360-4277-32-git-send-email-oscar.mateo@intel.com> References: <1399637360-4277-1-git-send-email-oscar.mateo@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 1E5186EF82 for ; Fri, 9 May 2014 05:15:00 -0700 (PDT) In-Reply-To: <1399637360-4277-1-git-send-email-oscar.mateo@intel.com> 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: Oscar Mateo We need it (at least) to properly update the last retired head. Signed-off-by: Oscar Mateo --- drivers/gpu/drm/i915/i915_gem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index f8acf3d..f9ed89e 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2224,7 +2224,10 @@ int __i915_add_request(struct intel_engine *ring, /* Hold a reference to the current context so that we can inspect * it later in case a hangcheck error event fires. */ - request->ctx = ring->last_context; + if (dev_priv->lrc_enabled) + request->ctx = ctx; + else + request->ctx = ring->last_context; if (request->ctx) i915_gem_context_reference(request->ctx); -- 1.9.0