[Intel-gfx] [PATCH v2 10/12] drm/i915: finish removal of gen from intel_device_info

[Jani Nikula]

On Mon, 12 Apr 2021, Lucas De Marchi <lucas.demarchi at intel.com> 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 <lucas.demarchi at intel.com>
> ---
>  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 <jani.nikula at intel.com>

> +#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