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=ham 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 6FA68C433EF for ; Tue, 21 Sep 2021 14:40:24 +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 2F11160F6E for ; Tue, 21 Sep 2021 14:40:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2F11160F6E 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 A59216E9C3; Tue, 21 Sep 2021 14:40:23 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 07F206E9C3; Tue, 21 Sep 2021 14:40:21 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10113"; a="221492268" X-IronPort-AV: E=Sophos;i="5.85,311,1624345200"; d="scan'208";a="221492268" 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 07:40:16 -0700 X-IronPort-AV: E=Sophos;i="5.85,311,1624345200"; d="scan'208";a="556965355" 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 07:40:14 -0700 To: Matt Roper , intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org, Chris Wilson References: <20210910201030.3436066-1-matthew.d.roper@intel.com> <20210910201030.3436066-6-matthew.d.roper@intel.com> From: Tvrtko Ursulin Organization: Intel Corporation UK Plc Message-ID: Date: Tue, 21 Sep 2021 15:40:13 +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-6-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 5/6] drm/i915/uncore: Drop gen11 mmio read handlers 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: > Consolidate down to just a single 'fwtable' implementation. For reads > we don't need to worry about shadow tables. Also, the > NEEDS_FORCE_WAKE() check we previously had in the fwtable implementation > can be dropped --- if a register is outside that range on one of the old > platforms, then it won't belong to any forcewake range and 0 will be > returned anyway. > > v2: > - Restore NEEDS_FORCE_WAKE() check. (Chris, Tvrtko) I started liking rewording the commit message when the revision log starts contradicting it, but it is just a suggestion. > > Cc: Chris Wilson > Cc: Tvrtko Ursulin > Signed-off-by: Matt Roper > --- > drivers/gpu/drm/i915/intel_uncore.c | 40 ++++++++++++----------------- > 1 file changed, 17 insertions(+), 23 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c > index bfb2a6337f9d..10f124297e7c 100644 > --- a/drivers/gpu/drm/i915/intel_uncore.c > +++ b/drivers/gpu/drm/i915/intel_uncore.c > @@ -935,9 +935,6 @@ static const struct intel_forcewake_range __vlv_fw_ranges[] = { > __fwd; \ > }) > > -#define __gen11_fwtable_reg_read_fw_domains(uncore, offset) \ > - find_fw_domain(uncore, offset) > - > /* *Must* be sorted by offset! See intel_shadow_table_check(). */ > static const struct i915_range gen8_shadowed_regs[] = { > { .start = 0x2030, .end = 0x2030 }, > @@ -1570,33 +1567,30 @@ static inline void __force_wake_auto(struct intel_uncore *uncore, > ___force_wake_auto(uncore, fw_domains); > } > > -#define __gen_read(func, x) \ > +#define __gen_fwtable_read(x) \ > static u##x \ > -func##_read##x(struct intel_uncore *uncore, i915_reg_t reg, bool trace) { \ > +fwtable_read##x(struct intel_uncore *uncore, i915_reg_t reg, bool trace) \ > +{ \ > enum forcewake_domains fw_engine; \ > GEN6_READ_HEADER(x); \ > - fw_engine = __##func##_reg_read_fw_domains(uncore, offset); \ > + fw_engine = __fwtable_reg_read_fw_domains(uncore, offset); \ > if (fw_engine) \ > __force_wake_auto(uncore, fw_engine); \ > val = __raw_uncore_read##x(uncore, reg); \ > GEN6_READ_FOOTER; \ > } > > -#define __gen_reg_read_funcs(func) \ > -static enum forcewake_domains \ > -func##_reg_read_fw_domains(struct intel_uncore *uncore, i915_reg_t reg) { \ > - return __##func##_reg_read_fw_domains(uncore, i915_mmio_reg_offset(reg)); \ > -} \ > -\ > -__gen_read(func, 8) \ > -__gen_read(func, 16) \ > -__gen_read(func, 32) \ > -__gen_read(func, 64) > +static enum forcewake_domains > +fwtable_reg_read_fw_domains(struct intel_uncore *uncore, i915_reg_t reg) { > + return __fwtable_reg_read_fw_domains(uncore, i915_mmio_reg_offset(reg)); > +} > > -__gen_reg_read_funcs(gen11_fwtable); > -__gen_reg_read_funcs(fwtable); > +__gen_fwtable_read(8) > +__gen_fwtable_read(16) > +__gen_fwtable_read(32) > +__gen_fwtable_read(64) > > -#undef __gen_reg_read_funcs > +#undef __gen_fwtable_read > #undef GEN6_READ_FOOTER > #undef GEN6_READ_HEADER > > @@ -2062,22 +2056,22 @@ static int uncore_forcewake_init(struct intel_uncore *uncore) > ASSIGN_FW_DOMAINS_TABLE(uncore, __dg2_fw_ranges); > ASSIGN_SHADOW_TABLE(uncore, gen12_shadowed_regs); > ASSIGN_WRITE_MMIO_VFUNCS(uncore, fwtable); > - ASSIGN_READ_MMIO_VFUNCS(uncore, gen11_fwtable); > + ASSIGN_READ_MMIO_VFUNCS(uncore, fwtable); > } else if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) { > ASSIGN_FW_DOMAINS_TABLE(uncore, __xehp_fw_ranges); > ASSIGN_SHADOW_TABLE(uncore, gen12_shadowed_regs); > ASSIGN_WRITE_MMIO_VFUNCS(uncore, fwtable); > - ASSIGN_READ_MMIO_VFUNCS(uncore, gen11_fwtable); > + ASSIGN_READ_MMIO_VFUNCS(uncore, fwtable); > } else if (GRAPHICS_VER(i915) >= 12) { > ASSIGN_FW_DOMAINS_TABLE(uncore, __gen12_fw_ranges); > ASSIGN_SHADOW_TABLE(uncore, gen12_shadowed_regs); > ASSIGN_WRITE_MMIO_VFUNCS(uncore, fwtable); > - ASSIGN_READ_MMIO_VFUNCS(uncore, gen11_fwtable); > + ASSIGN_READ_MMIO_VFUNCS(uncore, fwtable); > } else if (GRAPHICS_VER(i915) == 11) { > ASSIGN_FW_DOMAINS_TABLE(uncore, __gen11_fw_ranges); > ASSIGN_SHADOW_TABLE(uncore, gen11_shadowed_regs); > ASSIGN_WRITE_MMIO_VFUNCS(uncore, fwtable); > - ASSIGN_READ_MMIO_VFUNCS(uncore, gen11_fwtable); > + ASSIGN_READ_MMIO_VFUNCS(uncore, fwtable); > } else if (IS_GRAPHICS_VER(i915, 9, 10)) { > ASSIGN_FW_DOMAINS_TABLE(uncore, __gen9_fw_ranges); > ASSIGN_SHADOW_TABLE(uncore, gen8_shadowed_regs); > Reviewed-by: Tvrtko Ursulin Regards, Tvrtko