[Intel-xe] [PATCH 2/3] drm/xe: Fix platform order

[Matt Roper]

On Thu, Mar 23, 2023 at 10:17:53PM -0700, Lucas De Marchi wrote:
> Platform order is important when looping through the list of guc
> firmware blobs since we use it to prevent loading a blob for a newer
> platform onto an older one. Move PVC after ADL.

Shouldn't we be moving the ADL platforms (graphics versions 12.0) higher
than DG1 (12.10) and DG2 (12.50) too?


Matt

> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_platform_types.h | 3 +--
>  drivers/gpu/drm/xe/xe_uc_fw.c          | 2 +-
>  2 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_platform_types.h b/drivers/gpu/drm/xe/xe_platform_types.h
> index 72612c832e88..10367f6cc75a 100644
> --- a/drivers/gpu/drm/xe/xe_platform_types.h
> +++ b/drivers/gpu/drm/xe/xe_platform_types.h
> @@ -9,14 +9,13 @@
>  /* Keep in gen based order, and chronological order within a gen */
>  enum xe_platform {
>  	XE_PLATFORM_UNINITIALIZED = 0,
> -	/* gen12 */
>  	XE_TIGERLAKE,
>  	XE_ROCKETLAKE,
>  	XE_DG1,
>  	XE_DG2,
> -	XE_PVC,
>  	XE_ALDERLAKE_S,
>  	XE_ALDERLAKE_P,
> +	XE_PVC,
>  	XE_METEORLAKE,
>  };
>  
> diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c b/drivers/gpu/drm/xe/xe_uc_fw.c
> index e2c982b37e87..174c42873ebb 100644
> --- a/drivers/gpu/drm/xe/xe_uc_fw.c
> +++ b/drivers/gpu/drm/xe/xe_uc_fw.c
> @@ -43,9 +43,9 @@ static struct xe_device *uc_fw_to_xe(struct xe_uc_fw *uc_fw)
>   */
>  #define XE_GUC_FIRMWARE_DEFS(fw_def, guc_def) \
>  	fw_def(METEORLAKE,   guc_def(mtl,  70, 5, 2)) \
> +	fw_def(PVC,          guc_def(pvc,  70, 5, 2)) \
>  	fw_def(ALDERLAKE_P,  guc_def(adlp,  70, 5, 2)) \
>  	fw_def(ALDERLAKE_S,  guc_def(tgl,  70, 5, 2)) \
> -	fw_def(PVC,          guc_def(pvc,  70, 5, 2)) \
>  	fw_def(DG2,          guc_def(dg2,  70, 5, 2)) \
>  	fw_def(DG1,          guc_def(dg1,  70, 5, 2)) \
>  	fw_def(TIGERLAKE,    guc_def(tgl,  70, 5, 2))
> -- 
> 2.39.0
> 

-- 
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation