[PATCH v2 2/2] drm/xe: Refactor max_remote_tiles

[Matt Roper]

On Sun, Jan 19, 2025 at 06:06:44PM +0530, Sai Teja Pottumuttu wrote:
> max_remote_tiles is more related to the platform than the GT IP. Thus
> move it to platform descriptor from graphics descriptor. Note that the
> FIXME is no more required, thus it can be dropped.
> 
> Signed-off-by: Sai Teja Pottumuttu <sai.teja.pottumuttu at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_pci.c       | 9 +++------
>  drivers/gpu/drm/xe/xe_pci_types.h | 2 --
>  2 files changed, 3 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
> index a6395050a19f..2f7056d36f78 100644
> --- a/drivers/gpu/drm/xe/xe_pci.c
> +++ b/drivers/gpu/drm/xe/xe_pci.c
> @@ -55,6 +55,7 @@ struct xe_device_desc {
>  	enum xe_platform platform;
>  
>  	u8 dma_mask_size;
> +	u8 max_remote_tiles:2;
>  
>  	u8 require_force_probe:1;
>  	u8 is_dgfx:1;
> @@ -136,7 +137,6 @@ static const struct xe_graphics_desc graphics_xehpc = {
>  		BIT(XE_HW_ENGINE_CCS2) | BIT(XE_HW_ENGINE_CCS3),
>  
>  	XE_HP_FEATURES,
> -	.max_remote_tiles = 1,
>  	.va_bits = 57,
>  	.vm_max_level = 4,
>  	.vram_flags = XE_VRAM_FLAGS_NEED64K,
> @@ -333,6 +333,7 @@ static const struct xe_device_desc pvc_desc = {
>  	.dma_mask_size = 52,
>  	.has_display = false,
>  	.has_heci_gscfi = 1,
> +	.max_remote_tiles = 1,
>  	.require_force_probe = true,
>  };
>  
> @@ -641,6 +642,7 @@ static int xe_info_init_early(struct xe_device *xe,
>  	xe->info.probe_display = IS_ENABLED(CONFIG_DRM_XE_DISPLAY) &&
>  				 xe_modparam.probe_display &&
>  				 desc->has_display;
> +	xe->info.tile_count = 1 + desc->max_remote_tiles;
>  
>  	err = xe_tile_init_early(xe_device_get_root_tile(xe), xe, 0);
>  	if (err)
> @@ -712,12 +714,7 @@ static int xe_info_init(struct xe_device *xe,
>  	 * version 13 or higher has an additional dedicated media GT.  And
>  	 * depending on the graphics IP there may be additional "remote tiles."
>  	 * All of these together determine the overall GT count.
> -	 *
> -	 * FIXME: 'tile_count' here is misnamed since the rest of the driver
> -	 * treats it as the number of GTs rather than just the number of tiles.
>  	 */

The remaining part of this comment is sort of orphaned now; it's still
correct information but it's floating at a strange spot in the code.  It
might be best to move this down to just before the next loop that sets
up the GTs.

Aside from that,

        Reviewed-by: Matt Roper <matthew.d.roper at intel.com>


Matt

> -	xe->info.tile_count = 1 + graphics_desc->max_remote_tiles;
> -
>  	for_each_remote_tile(tile, xe, id) {
>  		int err;
>  
> diff --git a/drivers/gpu/drm/xe/xe_pci_types.h b/drivers/gpu/drm/xe/xe_pci_types.h
> index 7437415a54d5..b96423844952 100644
> --- a/drivers/gpu/drm/xe/xe_pci_types.h
> +++ b/drivers/gpu/drm/xe/xe_pci_types.h
> @@ -19,8 +19,6 @@ struct xe_graphics_desc {
>  
>  	u64 hw_engine_mask;	/* hardware engines provided by graphics IP */
>  
> -	u8 max_remote_tiles:2;
> -
>  	u8 has_asid:1;
>  	u8 has_atomic_enable_pte_bit:1;
>  	u8 has_flat_ccs:1;
> -- 
> 2.34.1
> 

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