drm/xe/mcr: Separate version from engine type selection

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@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://lore.kernel.org/r/20230317223441.3891073-1-lucas.demarchi@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_gt_mcr.c b/drivers/gpu/drm/xe/xe_gt_mcr.c
index 909059112179a732ccc588571dd70c9508c7b3e9..5412f77bc26fd5c651f8458bddffbc624b374d34 100644 (file)
--- 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 */