From patchwork Mon Nov 23 11:41:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Harrison X-Patchwork-Id: 7680401 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 58D5A9F1BE for ; Mon, 23 Nov 2015 11:42:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 716D5206B6 for ; Mon, 23 Nov 2015 11:42:36 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4DEE4206D8 for ; Mon, 23 Nov 2015 11:42:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A66086E550; Mon, 23 Nov 2015 03:42:34 -0800 (PST) X-Original-To: Intel-GFX@lists.freedesktop.org Delivered-To: Intel-GFX@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id AF4DD6E544 for ; Mon, 23 Nov 2015 03:42:28 -0800 (PST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP; 23 Nov 2015 03:42:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,336,1444719600"; d="scan'208";a="692487776" Received: from johnharr-linux.isw.intel.com ([10.102.226.93]) by orsmga003.jf.intel.com with ESMTP; 23 Nov 2015 03:42:28 -0800 From: John.C.Harrison@Intel.com To: Intel-GFX@Lists.FreeDesktop.Org Date: Mon, 23 Nov 2015 11:41:46 +0000 Message-Id: <1448278932-31551-12-git-send-email-John.C.Harrison@Intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448278932-31551-1-git-send-email-John.C.Harrison@Intel.com> References: <1448278932-31551-1-git-send-email-John.C.Harrison@Intel.com> Organization: Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ Subject: [Intel-gfx] [RFC 11/37] drm/i915/guc: Add a second client, to be used for preemption 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=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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: Dave Gordon This second client is created with priority KMD_HIGH, and marked as preemptive. For: VIZ-2021 Signed-off-by: Dave Gordon --- drivers/gpu/drm/i915/i915_debugfs.c | 9 +++++++++ drivers/gpu/drm/i915/i915_guc_submission.c | 15 ++++++++++++++- drivers/gpu/drm/i915/intel_guc.h | 1 + 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index fefe73c..9e8f624 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -2690,6 +2690,7 @@ static int i915_guc_info(struct seq_file *m, void *data) struct drm_i915_private *dev_priv = dev->dev_private; struct intel_guc guc; struct i915_guc_client client = {}; + struct i915_guc_client preempt = {}; struct intel_engine_cs *ring; enum intel_ring_id i; u64 total = 0; @@ -2705,6 +2706,11 @@ static int i915_guc_info(struct seq_file *m, void *data) client = *guc.execbuf_client; spin_unlock(&guc.execbuf_client->wq_lock); } + if (guc.preempt_client) { + spin_lock(&guc.preempt_client->wq_lock); + preempt = *guc.preempt_client; + spin_unlock(&guc.preempt_client->wq_lock); + } spin_unlock(&dev_priv->guc.host2guc_lock); seq_printf(m, "GuC total action count: %llu\n", guc.action_count); @@ -2725,6 +2731,9 @@ static int i915_guc_info(struct seq_file *m, void *data) seq_printf(m, "\nGuC execbuf client @ %p:\n", guc.execbuf_client); i915_guc_client_info(m, dev_priv, &client); + seq_printf(m, "\nGuC preempt client @ %p:\n", guc.preempt_client); + i915_guc_client_info(m, dev_priv, &preempt); + /* Add more as required ... */ return 0; diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c index 55e10eb..d8fd644 100644 --- a/drivers/gpu/drm/i915/i915_guc_submission.c +++ b/drivers/gpu/drm/i915/i915_guc_submission.c @@ -395,6 +395,8 @@ static void guc_init_ctx_desc(struct intel_guc *guc, memset(&desc, 0, sizeof(desc)); desc.attribute = GUC_CTX_DESC_ATTR_ACTIVE | GUC_CTX_DESC_ATTR_KERNEL; + if (client->priority <= GUC_CTX_PRIORITY_HIGH) + desc.attribute |= GUC_CTX_DESC_ATTR_PREEMPT; desc.context_id = client->ctx_index; desc.priority = client->priority; desc.db_id = client->doorbell_id; @@ -588,6 +590,9 @@ int i915_guc_submit(struct i915_guc_client *client, unsigned long flags; int q_ret, b_ret; + if (WARN_ON(ring_id >= I915_NUM_RINGS)) + return -ENXIO; + /* Need this because of the deferred pin ctx and ring */ /* Shall we move this right after ring is pinned? */ lr_context_update(rq); @@ -882,9 +887,15 @@ int i915_guc_submission_enable(struct drm_device *dev) DRM_ERROR("Failed to create execbuf guc_client\n"); return -ENOMEM; } - guc->execbuf_client = client; + /* 2nd client for preemptive submission */ + client = guc_client_alloc(dev, GUC_CTX_PRIORITY_KMD_HIGH, ctx); + if (!client) { + DRM_ERROR("Failed to create preemptive guc_client\n"); + } + guc->preempt_client = client; + host2guc_sample_forcewake(guc, client); return 0; @@ -895,6 +906,8 @@ void i915_guc_submission_disable(struct drm_device *dev) struct drm_i915_private *dev_priv = dev->dev_private; struct intel_guc *guc = &dev_priv->guc; + guc_client_free(dev, guc->preempt_client); + guc->preempt_client = NULL; guc_client_free(dev, guc->execbuf_client); guc->execbuf_client = NULL; } diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h index 386e79a..f56e0d9 100644 --- a/drivers/gpu/drm/i915/intel_guc.h +++ b/drivers/gpu/drm/i915/intel_guc.h @@ -94,6 +94,7 @@ struct intel_guc { struct ida ctx_ids; struct i915_guc_client *execbuf_client; + struct i915_guc_client *preempt_client; spinlock_t host2guc_lock; /* Protects all data below */