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.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 F0AECC433ED for ; Tue, 13 Apr 2021 09:46:02 +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 B1274613B6 for ; Tue, 13 Apr 2021 09:46:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B1274613B6 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 5E6D86E14F; Tue, 13 Apr 2021 09:46:02 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id CBED76E14F for ; Tue, 13 Apr 2021 09:46:01 +0000 (UTC) IronPort-SDR: z1m/FGdd5MMcZ6P9YeT8BCxZswZOxQK4WJ9ZNfMSy8tVh9ALX9vtn73rfix2moMi0/Tz4xEOs7 2fu+aRHNsIKA== X-IronPort-AV: E=McAfee;i="6200,9189,9952"; a="258352631" X-IronPort-AV: E=Sophos;i="5.82,219,1613462400"; d="scan'208";a="258352631" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2021 02:46:00 -0700 IronPort-SDR: 94ZdyfnvDvK1PcPYVGtVs7+AzCsmG78owtbMqEZcTR53KChHy1k2kuvOeAoZtqemjm8W4xUl/M a+91WS2reFxA== X-IronPort-AV: E=Sophos;i="5.82,219,1613462400"; d="scan'208";a="424181394" Received: from alinapar-mobl2.ger.corp.intel.com (HELO localhost) ([10.249.36.253]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2021 02:45:57 -0700 From: Jani Nikula To: Lucas De Marchi , intel-gfx@lists.freedesktop.org In-Reply-To: <20210413051002.92589-11-lucas.demarchi@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20210413051002.92589-1-lucas.demarchi@intel.com> <20210413051002.92589-11-lucas.demarchi@intel.com> Date: Tue, 13 Apr 2021 12:45:54 +0300 Message-ID: <87im4qh60d.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH v2 10/12] drm/i915: finish removal of gen from intel_device_info 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Mon, 12 Apr 2021, Lucas De Marchi wrote: > Now that it's not being used anymore, finish its removal. Like for > gen_mask, we replace INTEL_GEN() and IS_GEN() macros to use the new > field. > > Signed-off-by: Lucas De Marchi > --- > drivers/gpu/drm/i915/i915_drv.h | 10 +++++----- > drivers/gpu/drm/i915/i915_pci.c | 1 - > drivers/gpu/drm/i915/intel_device_info.h | 1 - > drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 +- > 4 files changed, 6 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index b984a340b21f..549ce0ce5bde 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1240,11 +1240,15 @@ static inline struct drm_i915_private *pdev_to_i915(struct pci_dev *pdev) > * Deprecated: this will be replaced by individual IP checks: > * GRAPHICS_VER(), MEDIA_VER and DISPLAY_VER() > */ > -#define INTEL_GEN(dev_priv) (INTEL_INFO(dev_priv)->gen) > +#define INTEL_GEN(dev_priv) GRAPHICS_VER(dev_priv) > /* > * Deprecated: use IS_GRAPHICS_VER() > */ > #define IS_GEN_RANGE(dev_priv, s, e) IS_GRAPHICS_VER(dev_priv, (s), (e)) > +/* > + * Deprecated: use GRAPHICS_VER() > + */ Nitpick, also mention media and display variants here. Reviewed-by: Jani Nikula > +#define IS_GEN(dev_priv, n) (GRAPHICS_VER(dev_priv) == (n)) > > #define GRAPHICS_VER(i915) (INTEL_INFO(i915)->graphics_ver) > #define IS_GRAPHICS_VER(i915, from, until) \ > @@ -1261,10 +1265,6 @@ static inline struct drm_i915_private *pdev_to_i915(struct pci_dev *pdev) > #define REVID_FOREVER 0xff > #define INTEL_REVID(dev_priv) (to_pci_dev((dev_priv)->drm.dev)->revision) > > -#define IS_GEN(dev_priv, n) \ > - (BUILD_BUG_ON_ZERO(!__builtin_constant_p(n)) + \ > - INTEL_INFO(dev_priv)->gen == (n)) > - > #define HAS_DSB(dev_priv) (INTEL_INFO(dev_priv)->display.has_dsb) > > /* > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c > index 3b9cd1af0f28..1453c1436f31 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -37,7 +37,6 @@ > > #define PLATFORM(x) .platform = (x) > #define GEN(x) \ > - .gen = (x), \ > .graphics_ver = (x), \ > .media_ver = (x), \ > .display.ver = (x) > diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h > index b8f7b996f140..8ab4fa6c7fdd 100644 > --- a/drivers/gpu/drm/i915/intel_device_info.h > +++ b/drivers/gpu/drm/i915/intel_device_info.h > @@ -163,7 +163,6 @@ struct intel_device_info { > u8 graphics_ver; > u8 media_ver; > > - u8 gen; > u8 gt; /* GT number, 0 if undefined */ > intel_engine_mask_t platform_engine_mask; /* Engines supported by the HW */ > > diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c > index 0188f877cab2..2ffc763fe90d 100644 > --- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c > +++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c > @@ -162,7 +162,7 @@ struct drm_i915_private *mock_gem_device(void) > /* Using the global GTT may ask questions about KMS users, so prepare */ > drm_mode_config_init(&i915->drm); > > - mkwrite_device_info(i915)->gen = -1; > + mkwrite_device_info(i915)->graphics_ver = -1; > > mkwrite_device_info(i915)->page_sizes = > I915_GTT_PAGE_SIZE_4K | -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx