From patchwork Mon Jun 19 10:59:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9795785 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E0742600C5 for ; Mon, 19 Jun 2017 10:59:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA317205D1 for ; Mon, 19 Jun 2017 10:59:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF04327D4D; Mon, 19 Jun 2017 10:59:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5B1C0205D1 for ; Mon, 19 Jun 2017 10:59:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0EC2F6E18D; Mon, 19 Jun 2017 10:59:27 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2C7446E189 for ; Mon, 19 Jun 2017 10:59:25 +0000 (UTC) Received: by mail-wr0-x242.google.com with SMTP id x23so12694143wrb.0 for ; Mon, 19 Jun 2017 03:59:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CVKjAuhtPt7LgJPIH1P7gqP3Qc9fVJwgGFgsFJreTLM=; b=xE39ZZO/Ygx6HzS1fDT9G/z0fh8aGnleqA1G38az/Bmy3XIXnMrqGYusp4m8XZ6E+q DCgUxxx0jYL3T6z/v9kqhpyJ6M8gNlrFc1LD30Kfz8TnMvc51LHYOhTr60bhazeuRl58 oUTbGog6uyzned2bmKvuWUTPC+FDJtDuV+daon0SnMnU56bmtbM0Vj159a2r9EbXsQ9p TQo3/PV3pTnEQm/5JZEK2fFJjoXtMcMOWbNaZiazRmNXXKKBFyIZe9TB0C+ix2gkL0UU sL8iLekHjcrei1D2IAJwDstpdmQwJL1O1vTrtVLiQLNUOBeT8nHj/VMy2v0R15g0ZJ31 /6hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CVKjAuhtPt7LgJPIH1P7gqP3Qc9fVJwgGFgsFJreTLM=; b=bLFtJg+JfDleaGMT3+ijYbZgQT19rIUrCnpFqzXTwZJU3PY1JFCKs/JQfN+A5tA27b 3sHZfUnWduak7IYlZQqMWNOuvmTbQbXsoIYrq2wZaywZLScUoVyuESsgVCrGsYhoWEun lK/yFpaDifa/Qf/hyldBjqAN3w59d0SpxFCMxn0gRE1HgcG9n0BatJ7dSHj9egDALs9j 4w7JAkXCS4LCCBvwXFKUhuQBP4cQY1G5nscWvE5WBtDctp2HF/e4sjStBeGAPhn3t9G1 ICLMnoZ8eAZSzgcb9giXOCWAxkdiIAeE3JDIeRiv6Phr0urbjbZ+3a/RGE6ZBA/haGcw ZPVg== X-Gm-Message-State: AKS2vOy0FRYeLulcRQGNYhd6Xa4b/+v3bne6Tacn/WnQuFG/s5JNFIqf koiypakfVYLLQJ1L75w= X-Received: by 10.223.162.151 with SMTP id s23mr14648024wra.68.1497869963529; Mon, 19 Jun 2017 03:59:23 -0700 (PDT) Received: from t460p.intel ([95.146.148.44]) by smtp.gmail.com with ESMTPSA id f8sm5576360wme.26.2017.06.19.03.59.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Jun 2017 03:59:23 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Mon, 19 Jun 2017 11:59:17 +0100 Message-Id: <20170619105917.9679-1-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <149762537592.14237.5096337938644611579@mail.alporthouse.com> References: <149762537592.14237.5096337938644611579@mail.alporthouse.com> Subject: [Intel-gfx] [PATCH v2 2/2] drm/i915: Do not re-calculate num_rings locally 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-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin Since bb8f0f5abdd7 ("drm/i915: Split intel_engine allocation and initialisation") intel_info->num_rings is set early in the load sequence and so available to be used direclty in the 2nd load phase. Signed-off-by: Tvrtko Ursulin Reviewed-by: Chris Wilson --- drivers/gpu/drm/i915/intel_ringbuffer.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index acd1da9b62a3..5224b7abb8a3 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -2140,7 +2140,7 @@ static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv, engine->emit_breadcrumb = gen6_sema_emit_breadcrumb; - num_rings = hweight32(INTEL_INFO(dev_priv)->ring_mask) - 1; + num_rings = INTEL_INFO(dev_priv)->num_rings - 1; if (INTEL_GEN(dev_priv) >= 8) { engine->emit_breadcrumb_sz += num_rings * 6; } else { @@ -2184,8 +2184,7 @@ int intel_init_render_ring_buffer(struct intel_engine_cs *engine) engine->semaphore.signal = gen8_rcs_signal; - num_rings = - hweight32(INTEL_INFO(dev_priv)->ring_mask) - 1; + num_rings = INTEL_INFO(dev_priv)->num_rings - 1; engine->emit_breadcrumb_sz += num_rings * 8; } } else if (INTEL_GEN(dev_priv) >= 6) {