drm/xe: Drop extra_gts[] declarations and XE_GT_TYPE_REMOTE

Now that tiles and GTs are handled separately, extra_gts[] doesn't
really provide any useful information that we can't just infer directly.
The primary GT of the root tile and of the remote tiles behave the same
way and don't need independent handling.

When we re-add support for media GTs in a future patch, the presence of
media can be determined from MEDIA_VER() (i.e., >= 13) and media's GSI
offset handling is expected to remain constant for all forseeable future
platforms, so it won't need to be provided in a definition structure
either.

Reviewed-by: Lucas De Marchi <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Matt Roper <[email protected]>
Signed-off-by: Rodrigo Vivi <[email protected]>

diff --git a/drivers/gpu/drm/xe/xe_gt_types.h b/drivers/gpu/drm/xe/xe_gt_types.h
index 34d5dd98885e93089dcd564e4230083cd7e6b61f..99ab7ec99ccd5f0fe495b6a47b14c5dcb454a064 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gt_types.h
+++ b/drivers/gpu/drm/xe/xe_gt_types.h
@@ -20,7 +20,6 @@ struct xe_ring_ops;
 enum xe_gt_type {
        XE_GT_TYPE_UNINITIALIZED,
        XE_GT_TYPE_MAIN,
-       XE_GT_TYPE_REMOTE,
        XE_GT_TYPE_MEDIA,
 };
 

diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
index d896d9fa25566079a87d9a8f26718e3ba04dc429..4fbcbfb8a93afa9df124237084d7b5597a2dc4c1 100644 (file)
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@ -44,7 +44,6 @@ struct xe_device_desc {
 
        const char *platform_name;
        const struct xe_subplatform_desc *subplatforms;
-       const struct xe_gt_desc *extra_gts;
 
        enum xe_platform platform;
 
@@ -257,20 +256,11 @@ static const struct xe_device_desc dg2_desc = {
        DG2_FEATURES,
 };
 
-static const struct xe_gt_desc pvc_gts[] = {
-       {
-               .type = XE_GT_TYPE_REMOTE,
-               .mmio_adj_limit = 0,
-               .mmio_adj_offset = 0,
-       },
-};
-
 static const __maybe_unused struct xe_device_desc pvc_desc = {
        .graphics = &graphics_xehpc,
        DGFX_FEATURES,
        PLATFORM(XE_PVC),
        .require_force_probe = true,
-       .extra_gts = pvc_gts,
 };
 
 static const struct xe_device_desc mtl_desc = {
@@ -540,28 +530,14 @@ static int xe_info_init(struct xe_device *xe,
                tile->id = id;
 
                gt = &tile->primary_gt;
-               gt->info.id = id;
+               gt->info.id = id;       /* FIXME: Determine sensible numbering */
                gt->tile = tile;
+               gt->info.type = XE_GT_TYPE_MAIN;
+               gt->info.__engine_mask = graphics_desc->hw_engine_mask;
+               if (MEDIA_VER(xe) < 13 && media_desc)
+                       gt->info.__engine_mask |= media_desc->hw_engine_mask;
 
-               if (id == 0) {
-                       gt->info.type = XE_GT_TYPE_MAIN;
-
-                       gt->info.__engine_mask = graphics_desc->hw_engine_mask;
-                       if (MEDIA_VER(xe) < 13 && media_desc)
-                               gt->info.__engine_mask |= media_desc->hw_engine_mask;
-
-                       gt->mmio.adj_limit = 0;
-                       gt->mmio.adj_offset = 0;
-               } else {
-                       gt->info.type = desc->extra_gts[id - 1].type;
-                       gt->info.__engine_mask = (gt->info.type == XE_GT_TYPE_MEDIA) ?
-                               media_desc->hw_engine_mask :
-                               graphics_desc->hw_engine_mask;
-                       gt->mmio.adj_limit =
-                               desc->extra_gts[id - 1].mmio_adj_limit;
-                       gt->mmio.adj_offset =
-                               desc->extra_gts[id - 1].mmio_adj_offset;
-               }
+               /* TODO: Init media GT, if present */
        }
 
        return 0;