From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F35B6C433EF for ; Tue, 21 Sep 2021 14:18:07 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BE33661168 for ; Tue, 21 Sep 2021 14:18:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BE33661168 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 75A8A6E9A5; Tue, 21 Sep 2021 14:18:05 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id EE2406E9A3; Tue, 21 Sep 2021 14:18:03 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10113"; a="221481374" X-IronPort-AV: E=Sophos;i="5.85,311,1624345200"; d="scan'208";a="221481374" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2021 06:54:58 -0700 X-IronPort-AV: E=Sophos;i="5.85,311,1624345200"; d="scan'208";a="556939560" Received: from ekyne-mobl.ger.corp.intel.com (HELO [10.213.200.64]) ([10.213.200.64]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2021 06:54:57 -0700 To: Matt Roper , intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org References: <20210910201030.3436066-1-matthew.d.roper@intel.com> <20210910201030.3436066-4-matthew.d.roper@intel.com> From: Tvrtko Ursulin Organization: Intel Corporation UK Plc Message-ID: <3a468336-6215-b413-6cb2-eba3ac4fc6dc@linux.intel.com> Date: Tue, 21 Sep 2021 14:54:56 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: <20210910201030.3436066-4-matthew.d.roper@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Intel-gfx] [PATCH v2 3/6] drm/i915/uncore: Replace gen8 write functions with general fwtable X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 10/09/2021 21:10, Matt Roper wrote: > Now that we have both a standard forcewake table (albeit a single-entry > table) and the shadow table stored in the uncore, we can drop the > gen8-specific write handlers in favor of the general fwtable version. > > Signed-off-by: Matt Roper > --- > drivers/gpu/drm/i915/intel_uncore.c | 13 +------------ > 1 file changed, 1 insertion(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c > index 5fa2bf26a948..4c6898746d10 100644 > --- a/drivers/gpu/drm/i915/intel_uncore.c > +++ b/drivers/gpu/drm/i915/intel_uncore.c > @@ -1046,16 +1046,6 @@ gen6_reg_write_fw_domains(struct intel_uncore *uncore, i915_reg_t reg) > return FORCEWAKE_RENDER; > } > > -#define __gen8_reg_write_fw_domains(uncore, offset) \ > -({ \ > - enum forcewake_domains __fwd; \ > - if (NEEDS_FORCE_WAKE(offset) && !is_shadowed(uncore, offset)) \ > - __fwd = FORCEWAKE_RENDER; \ > - else \ > - __fwd = 0; \ > - __fwd; \ > -}) > - > static const struct intel_forcewake_range __gen6_fw_ranges[] = { > GEN_FW_RANGE(0x0, 0x3ffff, FORCEWAKE_RENDER), > }; > @@ -1711,7 +1701,6 @@ __gen_write(func, 32) > __gen_reg_write_funcs(gen12_fwtable); > __gen_reg_write_funcs(gen11_fwtable); > __gen_reg_write_funcs(fwtable); > -__gen_reg_write_funcs(gen8); > > #undef __gen_reg_write_funcs > #undef GEN6_WRITE_FOOTER > @@ -2121,7 +2110,7 @@ static int uncore_forcewake_init(struct intel_uncore *uncore) > } else if (GRAPHICS_VER(i915) == 8) { > ASSIGN_FW_DOMAINS_TABLE(uncore, __gen6_fw_ranges); > ASSIGN_SHADOW_TABLE(uncore, gen8_shadowed_regs); > - ASSIGN_WRITE_MMIO_VFUNCS(uncore, gen8); > + ASSIGN_WRITE_MMIO_VFUNCS(uncore, fwtable); > ASSIGN_READ_MMIO_VFUNCS(uncore, fwtable); > } else if (IS_VALLEYVIEW(i915)) { > ASSIGN_FW_DOMAINS_TABLE(uncore, __vlv_fw_ranges); > Reviewed-by: Tvrtko Ursulin Regards, Tvrtko