From patchwork Thu Apr 28 08:56:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8966791 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 B5E18BF29F for ; Thu, 28 Apr 2016 08:57:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BB3EE202AE for ; Thu, 28 Apr 2016 08:57:24 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D45AE20220 for ; Thu, 28 Apr 2016 08:57:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 65C116EC90; Thu, 28 Apr 2016 08:57:19 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 49D186EC89 for ; Thu, 28 Apr 2016 08:57:14 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id w143so20853601wmw.3 for ; Thu, 28 Apr 2016 01:57:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=bjjFLX3sDLVtWLaz1TCJmqmGWCPl//c/04Dt0Y/hCjA=; b=HHhxEHQIysXxgS19W3/5ebR23RwKMJ8XBHoIa02WAVWGrQPTPEGl9PzSe9epyy4bNz AJ/dvyRFbm4phIbF1N4ei+T1CgXjxJoaoHwLG+wazpQfZ/o3xS1LhhpCg+5Gn5wMNe9y RJYCZtOvK8XWF0Uzhe+m4Q9H6i/UMRZWgPx2ah7dyRiDf5Q4t+m7zEuJ/7ojwwTy4SbE U9si9GrjccQ+xmerCPjR1kgcD7ipe1dRqHde5QtkBqFa0LuNGupnvd7U6QcHI3kC4CLk l8xiyU8179XVHjoGCGjda7zVOwkbiEqHCqLANM4RoE9H1hlbQc1LcitTlWeMSJgmsep4 XLGg== 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:subject:date:message-id :in-reply-to:references; bh=bjjFLX3sDLVtWLaz1TCJmqmGWCPl//c/04Dt0Y/hCjA=; b=QueaLrXPoTcadNwkErCd6N+khAXS024MfrS38fWuvymH2ot7TR6s2zLg4lha6k0hCh TdDvebEiCZyebp9VCjIiu/ILr5SlTIUyvI7Aa7Jc7mCdBXVFO2j6/VHaIQKmqtPcX99V gKrGdlGA7DLTdeL0JgSDKKx4LkzOxz2lmBAgCKEI6V0+7plh9+50LVPJHpjAyqZ9xWhd 1XysS9ggk+e17oeQf4tmIIRyx30BEqz0aHHv6KUzY+WagCPKqLvfatOPf2Og8WD8O0Ty FK1YWbby6jujNzzzLKhhpHivRszRAN9xhRTkcdjmb1FfvVbxQMYcKrF00AKXudQnjvRC 6VRg== X-Gm-Message-State: AOPr4FXk6TrU35CZICtY3lLUdCNPsaiBWJ2a+BniPrSTOzSBRZqvR8WqlQrvaMPpPvJR5Q== X-Received: by 10.28.57.137 with SMTP id g131mr15516119wma.5.1461833832352; Thu, 28 Apr 2016 01:57:12 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id f11sm28454544wmf.22.2016.04.28.01.57.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Apr 2016 01:57:11 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Thu, 28 Apr 2016 09:56:42 +0100 Message-Id: <1461833819-3991-8-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461833819-3991-1-git-send-email-chris@chris-wilson.co.uk> References: <1461833819-3991-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [CI 08/25] drm/i915: L3 cache remapping is part of context switching 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 Move the i915_gem_l3_remap function such that it next to the context switching, which is where we perform the L3 remap. Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Reviewed-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/i915_gem.c | 31 ------------------------------- drivers/gpu/drm/i915/i915_gem_context.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index f9ef11273698..f07cf81ef16b 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4730,37 +4730,6 @@ err: return ret; } -int i915_gem_l3_remap(struct drm_i915_gem_request *req, int slice) -{ - struct intel_engine_cs *engine = req->engine; - struct drm_device *dev = engine->dev; - struct drm_i915_private *dev_priv = dev->dev_private; - u32 *remap_info = dev_priv->l3_parity.remap_info[slice]; - int i, ret; - - if (!HAS_L3_DPF(dev) || !remap_info) - return 0; - - ret = intel_ring_begin(req, GEN7_L3LOG_SIZE / 4 * 3); - if (ret) - return ret; - - /* - * Note: We do not worry about the concurrent register cacheline hang - * here because no other code should access these registers other than - * at initialization time. - */ - for (i = 0; i < GEN7_L3LOG_SIZE / 4; i++) { - intel_ring_emit(engine, MI_LOAD_REGISTER_IMM(1)); - intel_ring_emit_reg(engine, GEN7_L3LOG(slice, i)); - intel_ring_emit(engine, remap_info[i]); - } - - intel_ring_advance(engine); - - return ret; -} - void i915_gem_init_swizzling(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 05752a2f1810..a429b4dcb4de 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -601,6 +601,37 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags) return ret; } +int i915_gem_l3_remap(struct drm_i915_gem_request *req, int slice) +{ + struct intel_engine_cs *engine = req->engine; + struct drm_device *dev = engine->dev; + struct drm_i915_private *dev_priv = dev->dev_private; + u32 *remap_info = dev_priv->l3_parity.remap_info[slice]; + int i, ret; + + if (!HAS_L3_DPF(dev) || !remap_info) + return 0; + + ret = intel_ring_begin(req, GEN7_L3LOG_SIZE / 4 * 3); + if (ret) + return ret; + + /* + * Note: We do not worry about the concurrent register cacheline hang + * here because no other code should access these registers other than + * at initialization time. + */ + for (i = 0; i < GEN7_L3LOG_SIZE / 4; i++) { + intel_ring_emit(engine, MI_LOAD_REGISTER_IMM(1)); + intel_ring_emit_reg(engine, GEN7_L3LOG(slice, i)); + intel_ring_emit(engine, remap_info[i]); + } + + intel_ring_advance(engine); + + return ret; +} + static inline bool skip_rcs_switch(struct intel_engine_cs *engine, struct intel_context *to) {