From patchwork Sun Apr 24 07:31:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8920061 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 39409BF440 for ; Sun, 24 Apr 2016 07:32:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5A7F92022D for ; Sun, 24 Apr 2016 07:32:32 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 9D0B9201ED for ; Sun, 24 Apr 2016 07:32:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1B4346E3E2; Sun, 24 Apr 2016 07:32:21 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id D23186E16A for ; Sun, 24 Apr 2016 07:32:16 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id w143so13232680wmw.3 for ; Sun, 24 Apr 2016 00:32:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=SzDrC1YkgBo8AiJB7K3ew15fKybsG9m5KNak5BO6ns8=; b=DGdHAk+lJrSkcD6IR4oLD3II+qh2cAiM7Czp6lbsAbaSA3JupEhvvedjSkq2PUA0b0 RUPaS4rMBVPTDtGz1T5UACfyLQoNoxbbETOxqTVYluHhjUu4YqT0AhEP8wGa5YgR4xNH VDNCYWdbkyq3/ctmG4ilRvfe6a44FWwovvO8vpNeEwdfukpv6yqv1H58t+kWHbBMvCul wt4li7QfESF19GiWfyjWg4gL7YGH78SENkZfalkLAVMQCEUn4ArHHE72Cej84tvfiqp4 6wzBA0H2revwFNZB0Jycu8lbdwMWd5W2z/d57GFpo5LLLa9AGnJfDYVvWXyC879cVIK1 K3iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=SzDrC1YkgBo8AiJB7K3ew15fKybsG9m5KNak5BO6ns8=; b=Gj06Bcm7HRNY9UWpljs9Sf/HuyZOrM4b1et1z8GJmuV6Hre2eLkRi6grg3UN5WwpP9 fKfwssjIGSeXCN/v9+AZzOe/Arw70akW0LvbeGLLgjjUfylOLtaIeoMQMLS61OEDOe8s gJBWaUJ2tj8SsXjmLsBU3MMyUJ8eL/YyygRgiwrWOQAm+TSJCsDdI6muQlafdI0o0uoE DT4xQpHIUAAMPZPUEmnqmkNBMn5k/e67mjHYJgS4LWmDj/a+67RRQhvNcJUgcA7wf+Zd zcs5bXR8k3eA4vKxmFKiNXuArQwxdCVt+cCYBctIM+sfXZbqb+Pd2ZF7ElOT+9yvvsNL 73vQ== X-Gm-Message-State: AOPr4FW31PJg4jZaEtJgU2BM3hW4BFB0S1i3JQmfK8+evEv4RBfnTyFAP1M11n6bmw0B3Q== X-Received: by 10.194.115.8 with SMTP id jk8mr28346840wjb.142.1461483135301; Sun, 24 Apr 2016 00:32:15 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id c4sm16964833wjm.24.2016.04.24.00.32.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 24 Apr 2016 00:32:14 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Sun, 24 Apr 2016 08:31:39 +0100 Message-Id: <1461483101-10618-19-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461483101-10618-1-git-send-email-chris@chris-wilson.co.uk> References: <1461483101-10618-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH v2 19/21] drm/i915: Store LRC hardware id in the request X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin This way in the following patch we can disconnect requests from contexts. Signed-off-by: Tvrtko Ursulin Reviewed-by: Chris Wilson Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/intel_lrc.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 515b8badce61..0efbe6c4634f 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2349,6 +2349,8 @@ struct drm_i915_gem_request { /** Execlists no. of times this request has been sent to the ELSP */ int elsp_submitted; + /** Execlists context hardware id. */ + unsigned ctx_hw_id; }; struct drm_i915_gem_request * __must_check diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 3293dd29e274..0c46a5cf4be0 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -477,7 +477,7 @@ execlists_check_remove_request(struct intel_engine_cs *engine, u32 request_id) if (!head_req) return 0; - if (unlikely(head_req->ctx->hw_id != request_id)) + if (unlikely(head_req->ctx_hw_id != request_id)) return 0; WARN(head_req->elsp_submitted == 0, "Never submitted head request\n"); @@ -615,6 +615,7 @@ static void execlists_context_queue(struct drm_i915_gem_request *request) } list_add_tail(&request->execlist_link, &engine->execlist_queue); + request->ctx_hw_id = request->ctx->hw_id; if (num_elements == 0) execlists_context_unqueue(engine);