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.4 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, 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 1D40BC636C9 for ; Wed, 21 Jul 2021 09:20:44 +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 D8BBF60231 for ; Wed, 21 Jul 2021 09:20:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D8BBF60231 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=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2D85E6E8D8; Wed, 21 Jul 2021 09:20:43 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0BF846E81C; Wed, 21 Jul 2021 09:20:41 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10051"; a="296962630" X-IronPort-AV: E=Sophos;i="5.84,257,1620716400"; d="scan'208";a="296962630" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2021 02:20:40 -0700 X-IronPort-AV: E=Sophos;i="5.84,257,1620716400"; d="scan'208";a="496548286" Received: from jcornall-mobl.ger.corp.intel.com (HELO [10.213.197.250]) ([10.213.197.250]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2021 02:20:38 -0700 Subject: Re: [Intel-gfx] [PATCH 3/4] drm/i915/gt: rename legacy engine->hw_id to engine->gen6_hw_id To: Lucas De Marchi , intel-gfx@lists.freedesktop.org References: <20210720232014.3302645-1-lucas.demarchi@intel.com> <20210720232014.3302645-4-lucas.demarchi@intel.com> From: Tvrtko Ursulin Organization: Intel Corporation UK Plc Message-ID: Date: Wed, 21 Jul 2021 10:20:37 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210720232014.3302645-4-lucas.demarchi@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tomas Winkler , dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 21/07/2021 00:20, Lucas De Marchi wrote: > We kept adding new engines and for that increasing hw_id unnecessarily: > it's not used since GRAPHICS_VER == 8. Prepend "gen6" to the field and > try to pack it in the structs to give a hint this field is actually not > used in recent platforms. > > Signed-off-by: Lucas De Marchi > --- > drivers/gpu/drm/i915/gt/intel_engine_cs.c | 12 ++++++------ > drivers/gpu/drm/i915/gt/intel_engine_types.h | 2 +- > drivers/gpu/drm/i915/i915_reg.h | 2 +- > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c > index a11f69f2e46e..508221de411c 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c > +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c > @@ -42,7 +42,7 @@ > > #define MAX_MMIO_BASES 3 > struct engine_info { > - unsigned int hw_id; > + u8 gen6_hw_id; > u8 class; > u8 instance; > /* mmio bases table *must* be sorted in reverse graphics_ver order */ > @@ -54,7 +54,7 @@ struct engine_info { > > static const struct engine_info intel_engines[] = { > [RCS0] = { > - .hw_id = RCS0_HW, > + .gen6_hw_id = RCS0_HW, > .class = RENDER_CLASS, > .instance = 0, > .mmio_bases = { > @@ -62,7 +62,7 @@ static const struct engine_info intel_engines[] = { > }, > }, > [BCS0] = { > - .hw_id = BCS0_HW, > + .gen6_hw_id = BCS0_HW, > .class = COPY_ENGINE_CLASS, > .instance = 0, > .mmio_bases = { > @@ -70,7 +70,7 @@ static const struct engine_info intel_engines[] = { > }, > }, > [VCS0] = { > - .hw_id = VCS0_HW, > + .gen6_hw_id = VCS0_HW, > .class = VIDEO_DECODE_CLASS, > .instance = 0, > .mmio_bases = { > @@ -102,7 +102,7 @@ static const struct engine_info intel_engines[] = { > }, > }, > [VECS0] = { > - .hw_id = VECS0_HW, > + .gen6_hw_id = VECS0_HW, > .class = VIDEO_ENHANCEMENT_CLASS, > .instance = 0, > .mmio_bases = { > @@ -290,7 +290,7 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id) > engine->i915 = i915; > engine->gt = gt; > engine->uncore = gt->uncore; > - engine->hw_id = info->hw_id; > + engine->gen6_hw_id = info->gen6_hw_id; > guc_class = engine_class_to_guc_class(info->class); > engine->guc_id = MAKE_GUC_ID(guc_class, info->instance); > engine->mmio_base = __engine_mmio_base(i915, info->mmio_bases); > diff --git a/drivers/gpu/drm/i915/gt/intel_engine_types.h b/drivers/gpu/drm/i915/gt/intel_engine_types.h > index a107eb58ffa2..266422d8d1b1 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine_types.h > +++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h > @@ -264,11 +264,11 @@ struct intel_engine_cs { > enum intel_engine_id id; > enum intel_engine_id legacy_idx; > > - unsigned int hw_id; > unsigned int guc_id; > > intel_engine_mask_t mask; > > + u8 gen6_hw_id; > u8 class; > u8 instance; > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 943fe485c662..8750ffce9d61 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -2572,7 +2572,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) > #define ARB_MODE_BWGTLB_DISABLE (1 << 9) > #define ARB_MODE_SWIZZLE_BDW (1 << 1) > #define RENDER_HWS_PGA_GEN7 _MMIO(0x04080) > -#define RING_FAULT_REG(engine) _MMIO(0x4094 + 0x100 * (engine)->hw_id) > +#define RING_FAULT_REG(engine) _MMIO(0x4094 + 0x100 * (engine)->gen6_hw_id) > #define GEN8_RING_FAULT_REG _MMIO(0x4094) > #define GEN12_RING_FAULT_REG _MMIO(0xcec4) > #define GEN8_RING_FAULT_ENGINE_ID(x) (((x) >> 12) & 0x7) > Reviewed-by: Tvrtko Ursulin Regards, Tvrtko 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.4 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, 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 A5C95C12002 for ; Wed, 21 Jul 2021 09:20:42 +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 760A760231 for ; Wed, 21 Jul 2021 09:20:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 760A760231 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=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 218916E81C; Wed, 21 Jul 2021 09:20:42 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0BF846E81C; Wed, 21 Jul 2021 09:20:41 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10051"; a="296962630" X-IronPort-AV: E=Sophos;i="5.84,257,1620716400"; d="scan'208";a="296962630" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2021 02:20:40 -0700 X-IronPort-AV: E=Sophos;i="5.84,257,1620716400"; d="scan'208";a="496548286" Received: from jcornall-mobl.ger.corp.intel.com (HELO [10.213.197.250]) ([10.213.197.250]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2021 02:20:38 -0700 To: Lucas De Marchi , intel-gfx@lists.freedesktop.org References: <20210720232014.3302645-1-lucas.demarchi@intel.com> <20210720232014.3302645-4-lucas.demarchi@intel.com> From: Tvrtko Ursulin Organization: Intel Corporation UK Plc Message-ID: Date: Wed, 21 Jul 2021 10:20:37 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210720232014.3302645-4-lucas.demarchi@intel.com> Content-Language: en-US Subject: Re: [Intel-gfx] [PATCH 3/4] drm/i915/gt: rename legacy engine->hw_id to engine->gen6_hw_id 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: , Cc: Tomas Winkler , dri-devel@lists.freedesktop.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 21/07/2021 00:20, Lucas De Marchi wrote: > We kept adding new engines and for that increasing hw_id unnecessarily: > it's not used since GRAPHICS_VER == 8. Prepend "gen6" to the field and > try to pack it in the structs to give a hint this field is actually not > used in recent platforms. > > Signed-off-by: Lucas De Marchi > --- > drivers/gpu/drm/i915/gt/intel_engine_cs.c | 12 ++++++------ > drivers/gpu/drm/i915/gt/intel_engine_types.h | 2 +- > drivers/gpu/drm/i915/i915_reg.h | 2 +- > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c > index a11f69f2e46e..508221de411c 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c > +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c > @@ -42,7 +42,7 @@ > > #define MAX_MMIO_BASES 3 > struct engine_info { > - unsigned int hw_id; > + u8 gen6_hw_id; > u8 class; > u8 instance; > /* mmio bases table *must* be sorted in reverse graphics_ver order */ > @@ -54,7 +54,7 @@ struct engine_info { > > static const struct engine_info intel_engines[] = { > [RCS0] = { > - .hw_id = RCS0_HW, > + .gen6_hw_id = RCS0_HW, > .class = RENDER_CLASS, > .instance = 0, > .mmio_bases = { > @@ -62,7 +62,7 @@ static const struct engine_info intel_engines[] = { > }, > }, > [BCS0] = { > - .hw_id = BCS0_HW, > + .gen6_hw_id = BCS0_HW, > .class = COPY_ENGINE_CLASS, > .instance = 0, > .mmio_bases = { > @@ -70,7 +70,7 @@ static const struct engine_info intel_engines[] = { > }, > }, > [VCS0] = { > - .hw_id = VCS0_HW, > + .gen6_hw_id = VCS0_HW, > .class = VIDEO_DECODE_CLASS, > .instance = 0, > .mmio_bases = { > @@ -102,7 +102,7 @@ static const struct engine_info intel_engines[] = { > }, > }, > [VECS0] = { > - .hw_id = VECS0_HW, > + .gen6_hw_id = VECS0_HW, > .class = VIDEO_ENHANCEMENT_CLASS, > .instance = 0, > .mmio_bases = { > @@ -290,7 +290,7 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id) > engine->i915 = i915; > engine->gt = gt; > engine->uncore = gt->uncore; > - engine->hw_id = info->hw_id; > + engine->gen6_hw_id = info->gen6_hw_id; > guc_class = engine_class_to_guc_class(info->class); > engine->guc_id = MAKE_GUC_ID(guc_class, info->instance); > engine->mmio_base = __engine_mmio_base(i915, info->mmio_bases); > diff --git a/drivers/gpu/drm/i915/gt/intel_engine_types.h b/drivers/gpu/drm/i915/gt/intel_engine_types.h > index a107eb58ffa2..266422d8d1b1 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine_types.h > +++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h > @@ -264,11 +264,11 @@ struct intel_engine_cs { > enum intel_engine_id id; > enum intel_engine_id legacy_idx; > > - unsigned int hw_id; > unsigned int guc_id; > > intel_engine_mask_t mask; > > + u8 gen6_hw_id; > u8 class; > u8 instance; > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 943fe485c662..8750ffce9d61 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -2572,7 +2572,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) > #define ARB_MODE_BWGTLB_DISABLE (1 << 9) > #define ARB_MODE_SWIZZLE_BDW (1 << 1) > #define RENDER_HWS_PGA_GEN7 _MMIO(0x04080) > -#define RING_FAULT_REG(engine) _MMIO(0x4094 + 0x100 * (engine)->hw_id) > +#define RING_FAULT_REG(engine) _MMIO(0x4094 + 0x100 * (engine)->gen6_hw_id) > #define GEN8_RING_FAULT_REG _MMIO(0x4094) > #define GEN12_RING_FAULT_REG _MMIO(0xcec4) > #define GEN8_RING_FAULT_ENGINE_ID(x) (((x) >> 12) & 0x7) > Reviewed-by: Tvrtko Ursulin Regards, Tvrtko _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx