[Intel-xe] [PATCH] drm/xe: Remove duplicate media_ver

[Souza, Jose]

On Tue, 2023-02-21 at 16:27 -0800, Lucas De Marchi wrote:
> media_verx100 supersedes the info from media_ver. Leave media_ver in the
> struct xe_device_desc, used in xe_pci.c since it's easier to define
> common parts of the platforms like that. However all the rest of the
> driver should be using media_verx100 that is more future proof.

Reviewed-by: José Roberto de Souza <jose.souza at intel.com>

> 
> Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/216
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_device_types.h | 2 --
>  drivers/gpu/drm/xe/xe_mmio.c         | 2 +-
>  drivers/gpu/drm/xe/xe_pci.c          | 1 -
>  3 files changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
> index 6c71e1b2dbf4..d3bfe5ed4dd9 100644
> --- a/drivers/gpu/drm/xe/xe_device_types.h
> +++ b/drivers/gpu/drm/xe/xe_device_types.h
> @@ -82,8 +82,6 @@ struct xe_device {
>  		u8 tile_count;
>  		/** @vm_max_level: Max VM level */
>  		u8 vm_max_level;
> -		/** @media_ver: Media version */
> -		u8 media_ver;
>  		/** @supports_usm: Supports unified shared memory */
>  		bool supports_usm;
>  		/** @has_asid: Has address space ID */
> diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c
> index ba327b1e8dea..c414ece6dfe3 100644
> --- a/drivers/gpu/drm/xe/xe_mmio.c
> +++ b/drivers/gpu/drm/xe/xe_mmio.c
> @@ -287,7 +287,7 @@ static void xe_mmio_probe_tiles(struct xe_device *xe)
>  	mtcfg = xe_mmio_read64(gt, XEHP_MTCFG_ADDR.reg);
>  	adj_tile_count = xe->info.tile_count =
>  		REG_FIELD_GET(TILE_COUNT, mtcfg) + 1;
> -	if (xe->info.media_ver >= 13)
> +	if (xe->info.media_verx100 >= 1300)
>  		xe->info.tile_count *= 2;
>  
>  	drm_info(&xe->drm, "tile_count: %d, adj_tile_count %d\n",
> diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
> index 25598de3a1fc..53fcfed5de5e 100644
> --- a/drivers/gpu/drm/xe/xe_pci.c
> +++ b/drivers/gpu/drm/xe/xe_pci.c
> @@ -485,7 +485,6 @@ static int xe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>  	xe->info.vram_flags = desc->vram_flags;
>  	xe->info.tile_count = desc->max_tiles;
>  	xe->info.vm_max_level = desc->vm_max_level;
> -	xe->info.media_ver = desc->media_ver;
>  	xe->info.supports_usm = desc->supports_usm;
>  	xe->info.has_asid = desc->has_asid;
>  	xe->info.has_flat_ccs = desc->has_flat_ccs;