From patchwork Sun Apr 24 07:18:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8919801 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 2C2D9BF29F for ; Sun, 24 Apr 2016 07:21:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3F9D4201EC for ; Sun, 24 Apr 2016 07:21:22 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 71E2C201C7 for ; Sun, 24 Apr 2016 07:21:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6DB1C6E10C; Sun, 24 Apr 2016 07:21:20 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 377696E109 for ; Sun, 24 Apr 2016 07:19:33 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id n3so16107399wmn.1 for ; Sun, 24 Apr 2016 00:19:33 -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=ynu5mUgnxfK3eE/H72GReN3ThrcyJFmKJYjcdqSQXVBKDZNogR5UrnchKA6a9HzHOW l+XWZZjeCkyxCME72NrBZmtfcZVl47HFfa1r21/wkC8+omSQsd1IIRAzMN+ebuL7JEWT WfyK4tC6tzZgKK5aDRbfbeCYF+ViTh8lsJLjFXk4ULOYvYrrX9lL+Nr/Am7KuW4Ym2Yf EF6Zv8mUeb3PWmspZLQlvruz+APwJ+coMDAVXL+TNlhfVb5FDOQnm8Kle0H7+KcdF1iB h7uwj4GBx7rxVbBrm3CZqiB9SXtNMvDigzRosm60LT/i3w0+DGi/hI7AQ+nx6DmM/p+A pGCg== 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=iVp8zPmjn4lK2TF9+fRVsGRMOc/gA12EqTh3P0waW1J68gig+E5OEOsVmFH3EomgOt puIcZTaBGIIkNs1TSBrjgYms09lYqkwe9QlRXJP2EVdhrzi4VM6eiCPqWO+j0yilBQ0R LanTKLyg1x5UuNcZsh7Lu5VwCO9AF7PoF5RBvMMJb7UmEadEnLaVOGaqcVoqe2j3XXmr k2IlpQnLu3EF8aATwgUjS9A11k0zDL+NtdrOptS3g92tYGtJjV0hp5ZgDCnyy39URH7X YvzwPzhTrN3KCeCIBO/8rQjf9KzHx79e1k3vtrHs3GOqnHUNvDo/v74QA/HgOFvmpbDV nUAg== X-Gm-Message-State: AOPr4FUtlUgzdbWfxYVxxwMDHndy0f1TBBR3F8A8AbBXQMUZLOioHI8vj1R+sxEMuIE3Ew== X-Received: by 10.28.158.15 with SMTP id h15mr5437106wme.35.1461482371665; Sun, 24 Apr 2016 00:19:31 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id i11sm16937119wjn.36.2016.04.24.00.19.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 24 Apr 2016 00:19:30 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Sun, 24 Apr 2016 08:18:50 +0100 Message-Id: <1461482332-21975-19-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461482332-21975-1-git-send-email-chris@chris-wilson.co.uk> References: <1461482332-21975-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 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);