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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 F06C2C6377A for ; Wed, 21 Jul 2021 22:47:26 +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 BFACC61248 for ; Wed, 21 Jul 2021 22:47:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BFACC61248 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=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 2C62189CA2; Wed, 21 Jul 2021 22:47:25 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id D681789CA2; Wed, 21 Jul 2021 22:47:23 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10052"; a="211250537" X-IronPort-AV: E=Sophos;i="5.84,258,1620716400"; d="scan'208";a="211250537" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2021 15:47:23 -0700 X-IronPort-AV: E=Sophos;i="5.84,258,1620716400"; d="scan'208";a="511959626" Received: from mdroper-desk1.fm.intel.com (HELO mdroper-desk1.amr.corp.intel.com) ([10.1.27.134]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2021 15:47:23 -0700 Date: Wed, 21 Jul 2021 15:47:22 -0700 From: Matt Roper To: Lucas De Marchi Subject: Re: [PATCH 2/4] drm/i915/gt: nuke unused legacy engine hw_id Message-ID: <20210721224722.GM4174536@mdroper-desk1.amr.corp.intel.com> References: <20210720232014.3302645-1-lucas.demarchi@intel.com> <20210720232014.3302645-3-lucas.demarchi@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210720232014.3302645-3-lucas.demarchi@intel.com> 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: intel-gfx@lists.freedesktop.org, Tvrtko Ursulin , Tomas Winkler , dri-devel@lists.freedesktop.org, John Harrison Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, Jul 20, 2021 at 04:20:12PM -0700, Lucas De Marchi wrote: > The engine hw_id is only used by RING_FAULT_REG(), which is not used > since GRAPHICS_VER == 8. We tend to keep adding new defines just to be > consistent, but let's try to remove them and let them defined to 0 when > not used. s/when not used/for engines that only exist on gen8+ platforms/ Reviewed-by: Matt Roper For historical reference, we did use hw_id on gen8+ platforms too until relatively recently --- it was used to set the engine's guc_id as well up until: commit c784e5249e773689e38d2bc1749f08b986621a26 Author: John Harrison Date: Wed Oct 28 07:58:24 2020 -0700 drm/i915/guc: Update to use firmware v49.0.1 Matt > > Signed-off-by: Lucas De Marchi > --- > drivers/gpu/drm/i915/gt/intel_engine_cs.c | 4 ---- > drivers/gpu/drm/i915/gt/intel_engine_types.h | 4 ---- > 2 files changed, 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 d561573ed98c..a11f69f2e46e 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c > +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c > @@ -80,7 +80,6 @@ static const struct engine_info intel_engines[] = { > }, > }, > [VCS1] = { > - .hw_id = VCS1_HW, > .class = VIDEO_DECODE_CLASS, > .instance = 1, > .mmio_bases = { > @@ -89,7 +88,6 @@ static const struct engine_info intel_engines[] = { > }, > }, > [VCS2] = { > - .hw_id = VCS2_HW, > .class = VIDEO_DECODE_CLASS, > .instance = 2, > .mmio_bases = { > @@ -97,7 +95,6 @@ static const struct engine_info intel_engines[] = { > }, > }, > [VCS3] = { > - .hw_id = VCS3_HW, > .class = VIDEO_DECODE_CLASS, > .instance = 3, > .mmio_bases = { > @@ -114,7 +111,6 @@ static const struct engine_info intel_engines[] = { > }, > }, > [VECS1] = { > - .hw_id = VECS1_HW, > .class = VIDEO_ENHANCEMENT_CLASS, > .instance = 1, > .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 1cb9c3b70b29..a107eb58ffa2 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine_types.h > +++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h > @@ -34,10 +34,6 @@ > #define VCS0_HW 1 > #define BCS0_HW 2 > #define VECS0_HW 3 > -#define VCS1_HW 4 > -#define VCS2_HW 6 > -#define VCS3_HW 7 > -#define VECS1_HW 12 > > /* Gen11+ HW Engine class + instance */ > #define RENDER_CLASS 0 > -- > 2.31.1 > -- Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 32269C6377C for ; Wed, 21 Jul 2021 22:47:30 +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 E9DFD61244 for ; Wed, 21 Jul 2021 22:47:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E9DFD61244 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=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 6A4AC6E0D8; Wed, 21 Jul 2021 22:47:25 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id D681789CA2; Wed, 21 Jul 2021 22:47:23 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10052"; a="211250537" X-IronPort-AV: E=Sophos;i="5.84,258,1620716400"; d="scan'208";a="211250537" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2021 15:47:23 -0700 X-IronPort-AV: E=Sophos;i="5.84,258,1620716400"; d="scan'208";a="511959626" Received: from mdroper-desk1.fm.intel.com (HELO mdroper-desk1.amr.corp.intel.com) ([10.1.27.134]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2021 15:47:23 -0700 Date: Wed, 21 Jul 2021 15:47:22 -0700 From: Matt Roper To: Lucas De Marchi Message-ID: <20210721224722.GM4174536@mdroper-desk1.amr.corp.intel.com> References: <20210720232014.3302645-1-lucas.demarchi@intel.com> <20210720232014.3302645-3-lucas.demarchi@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210720232014.3302645-3-lucas.demarchi@intel.com> Subject: Re: [Intel-gfx] [PATCH 2/4] drm/i915/gt: nuke unused legacy engine 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: intel-gfx@lists.freedesktop.org, Tomas Winkler , dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, Jul 20, 2021 at 04:20:12PM -0700, Lucas De Marchi wrote: > The engine hw_id is only used by RING_FAULT_REG(), which is not used > since GRAPHICS_VER == 8. We tend to keep adding new defines just to be > consistent, but let's try to remove them and let them defined to 0 when > not used. s/when not used/for engines that only exist on gen8+ platforms/ Reviewed-by: Matt Roper For historical reference, we did use hw_id on gen8+ platforms too until relatively recently --- it was used to set the engine's guc_id as well up until: commit c784e5249e773689e38d2bc1749f08b986621a26 Author: John Harrison Date: Wed Oct 28 07:58:24 2020 -0700 drm/i915/guc: Update to use firmware v49.0.1 Matt > > Signed-off-by: Lucas De Marchi > --- > drivers/gpu/drm/i915/gt/intel_engine_cs.c | 4 ---- > drivers/gpu/drm/i915/gt/intel_engine_types.h | 4 ---- > 2 files changed, 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 d561573ed98c..a11f69f2e46e 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c > +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c > @@ -80,7 +80,6 @@ static const struct engine_info intel_engines[] = { > }, > }, > [VCS1] = { > - .hw_id = VCS1_HW, > .class = VIDEO_DECODE_CLASS, > .instance = 1, > .mmio_bases = { > @@ -89,7 +88,6 @@ static const struct engine_info intel_engines[] = { > }, > }, > [VCS2] = { > - .hw_id = VCS2_HW, > .class = VIDEO_DECODE_CLASS, > .instance = 2, > .mmio_bases = { > @@ -97,7 +95,6 @@ static const struct engine_info intel_engines[] = { > }, > }, > [VCS3] = { > - .hw_id = VCS3_HW, > .class = VIDEO_DECODE_CLASS, > .instance = 3, > .mmio_bases = { > @@ -114,7 +111,6 @@ static const struct engine_info intel_engines[] = { > }, > }, > [VECS1] = { > - .hw_id = VECS1_HW, > .class = VIDEO_ENHANCEMENT_CLASS, > .instance = 1, > .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 1cb9c3b70b29..a107eb58ffa2 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine_types.h > +++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h > @@ -34,10 +34,6 @@ > #define VCS0_HW 1 > #define BCS0_HW 2 > #define VECS0_HW 3 > -#define VCS1_HW 4 > -#define VCS2_HW 6 > -#define VCS3_HW 7 > -#define VECS1_HW 12 > > /* Gen11+ HW Engine class + instance */ > #define RENDER_CLASS 0 > -- > 2.31.1 > -- Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx