From mboxrd@z Thu Jan 1 00:00:00 1970 From: oscar.mateo@intel.com Subject: [PATCH 26/49] drm/i915/bdw: Set the request context information correctly in the LRC case Date: Thu, 27 Mar 2014 17:59:55 +0000 Message-ID: <1395943218-7708-27-git-send-email-oscar.mateo@intel.com> References: <1395943218-7708-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 6B1ED6E9F3 for ; Thu, 27 Mar 2014 10:09:39 -0700 (PDT) In-Reply-To: <1395943218-7708-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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index e3c3c58..e844c50 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2213,7 +2213,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); @@ -2477,7 +2480,6 @@ i915_gem_retire_requests_ring(struct intel_engine *ring) trace_i915_gem_request_retire(ring, request->seqno); - /* TODO: request->ctx is not correctly updated for LR contexts */ ringbuf = intel_ringbuffer_get(ring, request->ctx); /* We know the GPU must have read the request to have -- 1.9.0