[Intel-xe] [PATCH 2/4] drm/xe: Annotate desc of platforms with display

[Matt Atwood]

On Wed, May 10, 2023 at 12:54:22PM -0700, Lucas De Marchi wrote:
> Some platforms don't have the display IP. Currently those are PVC and
> ATS-M. For PVC the current initialization order works as the display
> initialization can check by platform. However the display side can't
> differentiate ATS-M from DG2 to act accordingly.
> 
Reviewed-by: Matt Atwood <matthew.s.atwood at intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_pci.c | 17 ++++++++++++++---
>  1 file changed, 14 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
> index a6858fc7fe8d..7dfbc4fa138a 100644
> --- a/drivers/gpu/drm/xe/xe_pci.c
> +++ b/drivers/gpu/drm/xe/xe_pci.c
> @@ -52,6 +52,8 @@ struct xe_device_desc {
>  
>  	u8 require_force_probe:1;
>  	u8 is_dgfx:1;
> +	u8 has_display:1;
> +
>  	/*
>  	 * FIXME: Xe doesn't care about presence/lack of 4tile since we can
>  	 * already determine that from the graphics IP version.  This flag
> @@ -179,7 +181,8 @@ static const struct xe_device_desc tgl_desc = {
>  	.graphics = &graphics_xelp,
>  	.media = &media_xem,
>  	PLATFORM(XE_TIGERLAKE),
> -	.has_llc = 1,
> +	.has_display = true,
> +	.has_llc = true,
>  	.require_force_probe = true,
>  };
>  
> @@ -187,6 +190,7 @@ static const struct xe_device_desc rkl_desc = {
>  	.graphics = &graphics_xelp,
>  	.media = &media_xem,
>  	PLATFORM(XE_ROCKETLAKE),
> +	.has_display = true,
>  	.require_force_probe = true,
>  };
>  
> @@ -194,7 +198,8 @@ static const struct xe_device_desc adl_s_desc = {
>  	.graphics = &graphics_xelp,
>  	.media = &media_xem,
>  	PLATFORM(XE_ALDERLAKE_S),
> -	.has_llc = 1,
> +	.has_display = true,
> +	.has_llc = true,
>  	.require_force_probe = true,
>  };
>  
> @@ -204,7 +209,8 @@ static const struct xe_device_desc adl_p_desc = {
>  	.graphics = &graphics_xelp,
>  	.media = &media_xem,
>  	PLATFORM(XE_ALDERLAKE_P),
> -	.has_llc = 1,
> +	.has_display = true,
> +	.has_llc = true,
>  	.require_force_probe = true,
>  	.subplatforms = (const struct xe_subplatform_desc[]) {
>  		{ XE_SUBPLATFORM_ADLP_RPLU, "RPLU", adlp_rplu_ids },
> @@ -220,6 +226,7 @@ static const struct xe_device_desc dg1_desc = {
>  	.media = &media_xem,
>  	DGFX_FEATURES,
>  	PLATFORM(XE_DG1),
> +	.has_display = true,
>  	.require_force_probe = true,
>  };
>  
> @@ -244,6 +251,7 @@ static const struct xe_device_desc ats_m_desc = {
>  	.require_force_probe = true,
>  
>  	DG2_FEATURES,
> +	.has_display = false,
>  };
>  
>  static const struct xe_device_desc dg2_desc = {
> @@ -252,6 +260,7 @@ static const struct xe_device_desc dg2_desc = {
>  	.require_force_probe = true,
>  
>  	DG2_FEATURES,
> +	.has_display = true,
>  };
>  
>  static const struct xe_gt_desc pvc_gts[] = {
> @@ -267,6 +276,7 @@ static const struct xe_device_desc pvc_desc = {
>  	.graphics = &graphics_xehpc,
>  	DGFX_FEATURES,
>  	PLATFORM(XE_PVC),
> +	.has_display = false,
>  	.require_force_probe = true,
>  	.extra_gts = pvc_gts,
>  };
> @@ -284,6 +294,7 @@ static const struct xe_device_desc mtl_desc = {
>  	/* .graphics and .media determined via GMD_ID */
>  	.require_force_probe = true,
>  	PLATFORM(XE_METEORLAKE),
> +	.has_display = true,
>  	.extra_gts = xelpmp_gts,
>  };
>  
> -- 
> 2.40.1
>