From: Michel Thierry Subject: [PATCH 02/14] drm/i915: Extract l3 remapping out of ctx switch Date: Tue, 15 Jul 2014 17:20:39 +0100 Message-ID: <1405441251-28744-3-git-send-email-michel.thierry@intel.com> References: <1405441251-28744-1-git-send-email-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 194336E5B5 for ; Tue, 15 Jul 2014 09:20:53 -0700 (PDT) In-Reply-To: <1405441251-28744-1-git-send-email-michel.thierry@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org From: Ben Widawsky 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 a1dc885..9ab3dad 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -643,6 +643,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<legacy_hw_ctx.rcs_state == NULL); @@ -702,17 +720,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<