From patchwork Wed Apr 20 18:42:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 8894081 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 F156CBF29F for ; Wed, 20 Apr 2016 18:43:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0739120121 for ; Wed, 20 Apr 2016 18:43:04 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 2D1D62025A for ; Wed, 20 Apr 2016 18:43:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D3BBD6EAD8; Wed, 20 Apr 2016 18:42:55 +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 1C6AE6EACF for ; Wed, 20 Apr 2016 18:42:51 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id l6so16111803wml.3 for ; Wed, 20 Apr 2016 11:42:51 -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=XrPKPfRfehIfQ4TdZ22k51jnmPBlxaL15DaMZP9/ii0=; b=B6Mn/f0JrBQPTy1eeVXKQDhEanEor6SyCJlrUT9zmYquC0EUnC2gQLdorSGkRW58XX /3PFdNo1gRqRf+z4YkcRIIuJtRSnukw/mUw8uMDaMqEhSNKh+DQF7zZL3DpA3ubGQtut SXErSr/4HxbJhzvb96sXZwiEV2EblxlHks1m6VRxs9+ev3qpQW/efscVl4V5TZ11SRE/ oTn5yPY8qfva96SSfh0ZfUYM0hobR+LHD5qivg8X/4IYxCWWXNlzER9KHLMpaQ0OzVym iaDEEHzjlJrdNmQedhO5Np42Ns1tfatHQamsiL5sXJkMxD//WWPGLUNDrhPpAN1r1Age RZIA== 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=XrPKPfRfehIfQ4TdZ22k51jnmPBlxaL15DaMZP9/ii0=; b=NSwXRcdsJU65FosfYSg3zWfoAGw3B7tFaBgBrtm86gHoFq3J0mKgTV1EBQTpFAjPcF dg18dwqseeXr9QaIPuEmdoMC/YCD/0zoNrYbQrcaCZ8It1tc8y00O6qFc3tEJgcqxvzb lpskRKQ6tYDUJ1YrPyK5ExZ3zk5AKZh1QUNpPmZ/XhIdRGiwV7DaXezQeZQ7Cm0x+WRr min1WLODqKDzuLd9/ZsUUE4VwTWW1SE1bu5K7r+EI1AvoHXevlmuivtTBUYmRfP5B/9A rZ6XPfJ27HkFS6iqqE0WT/nZVKKDKM9Ty2mBcjQqh1tHCFzAjeOO7e6KxSG10n++EmwK MsXQ== X-Gm-Message-State: AOPr4FU+x/5enLyQighEsv18jL+nk6JH0PXABdnXb0lim6g6fPx1WDLcCD2B5tLz9fj2Ww== X-Received: by 10.194.5.101 with SMTP id r5mr10596948wjr.47.1461177769322; Wed, 20 Apr 2016 11:42:49 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id f8sm6934510wjm.13.2016.04.20.11.42.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Apr 2016 11:42:48 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Wed, 20 Apr 2016 19:42:18 +0100 Message-Id: <1461177750-20187-8-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461177750-20187-1-git-send-email-chris@chris-wilson.co.uk> References: <1461177750-20187-1-git-send-email-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH 07/19] 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 7c4630656d7a..d3e226b714fa 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4734,37 +4734,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 bf31ee1ed914..7b0a82c0d6e0 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) {