[Intel-gfx] [PATCH v2 04/12] drm/i915: add macros for graphics and media versions

[Jani Nikula]

On Mon, 12 Apr 2021, Lucas De Marchi <lucas.demarchi at intel.com> wrote:
> Like it was done in
> commit 01eb15c9165e ("drm/i915: Add DISPLAY_VER() and related macros")
> add the correspondent macros for graphics and media. Going forward we
> will prefer checking the versions for the specific IPs (graphics, media
> and display) rather than grouping everything under a "gen" version.
>
> For consistency and to make the maintenance easier, it'd be preferred
> not to mix the *GEN* macros with the new ones. For older platforms we
> can simply consider that the previous "gen" number will extend to all
> 3 IPs. Then we can start replacing its use in the driver. Right now this
> replacement is not done and only the infrastructure is put in place.
> We also leave gen and gen_mask inside struct intel_device_info while
> it's still being used throughout the code.
>
> v2: Repurpose IS_{GRAPHICS,MEDIA}_VER() macros to work with a range
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> Reviewed-by: José Roberto de Souza <jose.souza at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.h          | 15 ++++++++++++++-
>  drivers/gpu/drm/i915/i915_pci.c          |  7 ++++++-
>  drivers/gpu/drm/i915/intel_device_info.h |  3 +++
>  3 files changed, 23 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 907c66efb469..cb59eb0f6c5b 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1234,9 +1234,22 @@ static inline struct drm_i915_private *pdev_to_i915(struct pci_dev *pdev)
>  #define RUNTIME_INFO(dev_priv)	(&(dev_priv)->__runtime)
>  #define DRIVER_CAPS(dev_priv)	(&(dev_priv)->caps)
>  
> -#define INTEL_GEN(dev_priv)	(INTEL_INFO(dev_priv)->gen)
>  #define INTEL_DEVID(dev_priv)	(RUNTIME_INFO(dev_priv)->device_id)
>  
> +/*
> + * Deprecated: this will be replaced by individual IP checks:
> + * GRAPHICS_VER(), MEDIA_VER and DISPLAY_VER()

Nitpick, MEDIA_VER() with braces.

Otherwise,

Reviewed-by: Jani Nikula <jani.nikula at intel.com>


> + */
> +#define INTEL_GEN(dev_priv)		(INTEL_INFO(dev_priv)->gen)
> +
> +#define GRAPHICS_VER(i915)		(INTEL_INFO(i915)->graphics_ver)
> +#define IS_GRAPHICS_VER(i915, from, until) \
> +	(GRAPHICS_VER(i915) >= (from) && GRAPHICS_VER(i915) <= (until))
> +
> +#define MEDIA_VER(i915)			(INTEL_INFO(i915)->media_ver)
> +#define IS_MEDIA_VER(i915, from, until) \
> +	(MEDIA_VER(i915) >= (from) && MEDIA_VER(i915) <= (until))
> +
>  #define DISPLAY_VER(i915)	(INTEL_INFO(i915)->display.ver)
>  #define IS_DISPLAY_VER(i915, from, until) \
>  	(DISPLAY_VER(i915) >= (from) && DISPLAY_VER(i915) <= (until))
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index ce5cbeaf036d..97ab73276334 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -36,7 +36,12 @@
>  #include "i915_selftest.h"
>  
>  #define PLATFORM(x) .platform = (x)
> -#define GEN(x) .gen = (x), .gen_mask = BIT((x) - 1), .display.ver = (x)
> +#define GEN(x) \
> +	.gen_mask = BIT((x) - 1), \
> +	.gen = (x), \
> +	.graphics_ver = (x), \
> +	.media_ver = (x), \
> +	.display.ver = (x)
>  
>  #define I845_PIPE_OFFSETS \
>  	.pipe_offsets = { \
> diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
> index b16c75927a12..405883a8cc84 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.h
> +++ b/drivers/gpu/drm/i915/intel_device_info.h
> @@ -162,6 +162,9 @@ enum intel_ppgtt_type {
>  struct intel_device_info {
>  	u16 gen_mask;
>  
> +	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 */

-- 
Jani Nikula, Intel Open Source Graphics Center