[Intel-xe] [PATCH] drm/xe/mcr: Separate version from engine type selection

[Matt Roper]

On Fri, Mar 17, 2023 at 03:34:41PM -0700, Lucas De Marchi wrote:
> In order to improve readability and make it more future proof,
> split the engine type from the graphics/platform checks.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>

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

> ---
> 
> Easier to see the code move with no behavior change with:
> 
> 	git show --ignore-space-change
> 
> 	
>  drivers/gpu/drm/xe/xe_gt_mcr.c | 32 +++++++++++++++++---------------
>  1 file changed, 17 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_gt_mcr.c b/drivers/gpu/drm/xe/xe_gt_mcr.c
> index 909059112179..5412f77bc26f 100644
> --- a/drivers/gpu/drm/xe/xe_gt_mcr.c
> +++ b/drivers/gpu/drm/xe/xe_gt_mcr.c
> @@ -290,22 +290,24 @@ void xe_gt_mcr_init(struct xe_gt *gt)
>  		drm_WARN_ON(&xe->drm, MEDIA_VER(xe) < 13);
>  
>  		gt->steering[OADDRM].ranges = xelpmp_oaddrm_steering_table;
> -	} else if (GRAPHICS_VERx100(xe) >= 1270) {
> -		gt->steering[INSTANCE0].ranges = xelpg_instance0_steering_table;
> -		gt->steering[L3BANK].ranges = xelpg_l3bank_steering_table;
> -		gt->steering[DSS].ranges = xelpg_dss_steering_table;
> -	} else if (xe->info.platform == XE_PVC) {
> -		gt->steering[INSTANCE0].ranges = xehpc_instance0_steering_table;
> -		gt->steering[DSS].ranges = xehpc_dss_steering_table;
> -	} else if (xe->info.platform == XE_DG2) {
> -		gt->steering[L3BANK].ranges = xehp_l3bank_steering_table;
> -		gt->steering[MSLICE].ranges = xehp_mslice_steering_table;
> -		gt->steering[LNCF].ranges = xehp_lncf_steering_table;
> -		gt->steering[DSS].ranges = xehp_dss_steering_table;
> -		gt->steering[IMPLICIT_STEERING].ranges = dg2_implicit_steering_table;
>  	} else {
> -		gt->steering[L3BANK].ranges = xelp_l3bank_steering_table;
> -		gt->steering[DSS].ranges = xelp_dss_steering_table;
> +		if (GRAPHICS_VERx100(xe) >= 1270) {
> +			gt->steering[INSTANCE0].ranges = xelpg_instance0_steering_table;
> +			gt->steering[L3BANK].ranges = xelpg_l3bank_steering_table;
> +			gt->steering[DSS].ranges = xelpg_dss_steering_table;
> +		} else if (xe->info.platform == XE_PVC) {
> +			gt->steering[INSTANCE0].ranges = xehpc_instance0_steering_table;
> +			gt->steering[DSS].ranges = xehpc_dss_steering_table;
> +		} else if (xe->info.platform == XE_DG2) {
> +			gt->steering[L3BANK].ranges = xehp_l3bank_steering_table;
> +			gt->steering[MSLICE].ranges = xehp_mslice_steering_table;
> +			gt->steering[LNCF].ranges = xehp_lncf_steering_table;
> +			gt->steering[DSS].ranges = xehp_dss_steering_table;
> +			gt->steering[IMPLICIT_STEERING].ranges = dg2_implicit_steering_table;
> +		} else {
> +			gt->steering[L3BANK].ranges = xelp_l3bank_steering_table;
> +			gt->steering[DSS].ranges = xelp_dss_steering_table;
> +		}
>  	}
>  
>  	/* Select non-terminated steering target for each type */
> -- 
> 2.39.0
> 

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