From patchwork Tue Jun 24 01:48:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 4406081 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E372ABEEAA for ; Tue, 24 Jun 2014 01:49:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D2B39202E9 for ; Tue, 24 Jun 2014 01:49:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id DAE7F20353 for ; Tue, 24 Jun 2014 01:49:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D98EC6E4BF; Mon, 23 Jun 2014 18:49:14 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 854C66E4A2 for ; Mon, 23 Jun 2014 18:49:13 -0700 (PDT) Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 23 Jun 2014 18:48:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,534,1400050800"; d="scan'208";a="449094758" Received: from unknown (HELO ironside.intel.com) ([10.255.13.30]) by azsmga001.ch.intel.com with ESMTP; 23 Jun 2014 18:48:52 -0700 From: Ben Widawsky To: Intel GFX Date: Mon, 23 Jun 2014 18:48:44 -0700 Message-Id: <1403574526-15585-4-git-send-email-benjamin.widawsky@intel.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1403574526-15585-1-git-send-email-benjamin.widawsky@intel.com> References: <1403574526-15585-1-git-send-email-benjamin.widawsky@intel.com> Cc: Ben Widawsky , Ben Widawsky Subject: [Intel-gfx] [PATCH 4/6] drm/i915: Extract l3 remapping out of ctx switch X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 This is just a cosmetic change to try to put do_switch_rcs on a diet. As it stands, the function was quite complex, and error prone. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_gem_context.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 35985ad..f2c4948 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -623,6 +623,24 @@ static int do_switch_xcs(struct intel_engine_cs *ring, return 0; } +static void remap_l3(struct intel_engine_cs *ring, + struct intel_context *ctx) +{ + int ret, i; + + for (i = 0; i < MAX_L3_SLICES; i++) { + if (!(ctx->remap_slice & (1<remap_slice &= ~(1<obj == NULL); @@ -681,17 +699,7 @@ static int do_switch_rcs(struct intel_engine_cs *ring, if (ret) goto unpin_out; - for (i = 0; i < MAX_L3_SLICES; i++) { - if (!(to->remap_slice & (1<remap_slice &= ~(1<