On Tue, Aug 20, 2024 at 10:00:43PM +0300, Jani Nikula wrote:
> The code is now unused. Remove.
>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Reviewed-by: Matt Roper <matthew.d.roper@xxxxxxxxx>
> ---
> drivers/gpu/drm/xe/xe_debugfs.c | 3 +-
> drivers/gpu/drm/xe/xe_pci.c | 3 +-
> drivers/gpu/drm/xe/xe_step.c | 57 +++++++++++++-----------------
> drivers/gpu/drm/xe/xe_step_types.h | 1 -
> 4 files changed, 27 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_debugfs.c b/drivers/gpu/drm/xe/xe_debugfs.c
> index 1011e5d281fa..a64bae36e0e3 100644
> --- a/drivers/gpu/drm/xe/xe_debugfs.c
> +++ b/drivers/gpu/drm/xe/xe_debugfs.c
> @@ -47,10 +47,9 @@ static int info(struct seq_file *m, void *data)
>
> drm_printf(&p, "graphics_verx100 %d\n", xe->info.graphics_verx100);
> drm_printf(&p, "media_verx100 %d\n", xe->info.media_verx100);
> - drm_printf(&p, "stepping G:%s M:%s D:%s B:%s\n",
> + drm_printf(&p, "stepping G:%s M:%s B:%s\n",
> xe_step_name(xe->info.step.graphics),
> xe_step_name(xe->info.step.media),
> - xe_step_name(xe->info.step.display),
> xe_step_name(xe->info.step.basedie));
> drm_printf(&p, "is_dgfx %s\n", str_yes_no(xe->info.is_dgfx));
> drm_printf(&p, "platform %d\n", xe->info.platform);
> diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
> index 3c34b032ebf4..0c2342988650 100644
> --- a/drivers/gpu/drm/xe/xe_pci.c
> +++ b/drivers/gpu/drm/xe/xe_pci.c
> @@ -838,10 +838,9 @@ static int xe_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> xe->info.dma_mask_size, xe->info.tile_count,
> xe->info.has_heci_gscfi, xe->info.has_heci_cscfi);
>
> - drm_dbg(&xe->drm, "Stepping = (G:%s, M:%s, D:%s, B:%s)\n",
> + drm_dbg(&xe->drm, "Stepping = (G:%s, M:%s, B:%s)\n",
> xe_step_name(xe->info.step.graphics),
> xe_step_name(xe->info.step.media),
> - xe_step_name(xe->info.step.display),
> xe_step_name(xe->info.step.basedie));
>
> drm_dbg(&xe->drm, "SR-IOV support: %s (mode: %s)\n",
> diff --git a/drivers/gpu/drm/xe/xe_step.c b/drivers/gpu/drm/xe/xe_step.c
> index eaf1b718f26c..c77b5c317fa0 100644
> --- a/drivers/gpu/drm/xe/xe_step.c
> +++ b/drivers/gpu/drm/xe/xe_step.c
> @@ -28,23 +28,17 @@
> * use a macro to define these to make it easier to identify the platforms
> * where the two steppings can deviate.
> */
> -#define COMMON_GT_MEDIA_STEP(x_) \
> - .graphics = STEP_##x_, \
> - .media = STEP_##x_
> -
> #define COMMON_STEP(x_) \
> - COMMON_GT_MEDIA_STEP(x_), \
> .graphics = STEP_##x_, \
> - .media = STEP_##x_, \
> - .display = STEP_##x_
> + .media = STEP_##x_
>
> __diag_push();
> __diag_ignore_all("-Woverride-init", "Allow field overrides in table");
>
> /* Same GT stepping between tgl_uy_revids and tgl_revids don't mean the same HW */
> static const struct xe_step_info tgl_revids[] = {
> - [0] = { COMMON_GT_MEDIA_STEP(A0), .display = STEP_B0 },
> - [1] = { COMMON_GT_MEDIA_STEP(B0), .display = STEP_D0 },
> + [0] = { COMMON_STEP(A0) },
> + [1] = { COMMON_STEP(B0) },
> };
>
> static const struct xe_step_info dg1_revids[] = {
> @@ -53,49 +47,49 @@ static const struct xe_step_info dg1_revids[] = {
> };
>
> static const struct xe_step_info adls_revids[] = {
> - [0x0] = { COMMON_GT_MEDIA_STEP(A0), .display = STEP_A0 },
> - [0x1] = { COMMON_GT_MEDIA_STEP(A0), .display = STEP_A2 },
> - [0x4] = { COMMON_GT_MEDIA_STEP(B0), .display = STEP_B0 },
> - [0x8] = { COMMON_GT_MEDIA_STEP(C0), .display = STEP_B0 },
> - [0xC] = { COMMON_GT_MEDIA_STEP(D0), .display = STEP_C0 },
> + [0x0] = { COMMON_STEP(A0) },
> + [0x1] = { COMMON_STEP(A0) },
> + [0x4] = { COMMON_STEP(B0) },
> + [0x8] = { COMMON_STEP(C0) },
> + [0xC] = { COMMON_STEP(D0) },
> };
>
> static const struct xe_step_info adls_rpls_revids[] = {
> - [0x4] = { COMMON_GT_MEDIA_STEP(D0), .display = STEP_D0 },
> - [0xC] = { COMMON_GT_MEDIA_STEP(D0), .display = STEP_C0 },
> + [0x4] = { COMMON_STEP(D0) },
> + [0xC] = { COMMON_STEP(D0) },
> };
>
> static const struct xe_step_info adlp_revids[] = {
> - [0x0] = { COMMON_GT_MEDIA_STEP(A0), .display = STEP_A0 },
> - [0x4] = { COMMON_GT_MEDIA_STEP(B0), .display = STEP_B0 },
> - [0x8] = { COMMON_GT_MEDIA_STEP(C0), .display = STEP_C0 },
> - [0xC] = { COMMON_GT_MEDIA_STEP(C0), .display = STEP_D0 },
> + [0x0] = { COMMON_STEP(A0) },
> + [0x4] = { COMMON_STEP(B0) },
> + [0x8] = { COMMON_STEP(C0) },
> + [0xC] = { COMMON_STEP(C0) },
> };
>
> static const struct xe_step_info adlp_rpl_revids[] = {
> - [0x4] = { COMMON_GT_MEDIA_STEP(C0), .display = STEP_E0 },
> + [0x4] = { COMMON_STEP(C0) },
> };
>
> static const struct xe_step_info adln_revids[] = {
> - [0x0] = { COMMON_GT_MEDIA_STEP(A0), .display = STEP_D0 },
> + [0x0] = { COMMON_STEP(A0) },
> };
>
> static const struct xe_step_info dg2_g10_revid_step_tbl[] = {
> - [0x0] = { COMMON_GT_MEDIA_STEP(A0), .display = STEP_A0 },
> - [0x1] = { COMMON_GT_MEDIA_STEP(A1), .display = STEP_A0 },
> - [0x4] = { COMMON_GT_MEDIA_STEP(B0), .display = STEP_B0 },
> - [0x8] = { COMMON_GT_MEDIA_STEP(C0), .display = STEP_C0 },
> + [0x0] = { COMMON_STEP(A0) },
> + [0x1] = { COMMON_STEP(A1) },
> + [0x4] = { COMMON_STEP(B0) },
> + [0x8] = { COMMON_STEP(C0) },
> };
>
> static const struct xe_step_info dg2_g11_revid_step_tbl[] = {
> - [0x0] = { COMMON_GT_MEDIA_STEP(A0), .display = STEP_B0 },
> - [0x4] = { COMMON_GT_MEDIA_STEP(B0), .display = STEP_C0 },
> - [0x5] = { COMMON_GT_MEDIA_STEP(B1), .display = STEP_C0 },
> + [0x0] = { COMMON_STEP(A0) },
> + [0x4] = { COMMON_STEP(B0) },
> + [0x5] = { COMMON_STEP(B1) },
> };
>
> static const struct xe_step_info dg2_g12_revid_step_tbl[] = {
> - [0x0] = { COMMON_GT_MEDIA_STEP(A0), .display = STEP_C0 },
> - [0x1] = { COMMON_GT_MEDIA_STEP(A1), .display = STEP_C0 },
> + [0x0] = { COMMON_STEP(A0) },
> + [0x1] = { COMMON_STEP(A1) },
> };
>
> static const struct xe_step_info pvc_revid_step_tbl[] = {
> @@ -195,7 +189,6 @@ struct xe_step_info xe_step_pre_gmdid_get(struct xe_device *xe)
> } else {
> drm_dbg(&xe->drm, "Using future steppings\n");
> step.graphics = STEP_FUTURE;
> - step.display = STEP_FUTURE;
> }
> }
>
> diff --git a/drivers/gpu/drm/xe/xe_step_types.h b/drivers/gpu/drm/xe/xe_step_types.h
> index 95b38d2d6c50..d978cc2512f2 100644
> --- a/drivers/gpu/drm/xe/xe_step_types.h
> +++ b/drivers/gpu/drm/xe/xe_step_types.h
> @@ -11,7 +11,6 @@
> struct xe_step_info {
> u8 graphics;
> u8 media;
> - u8 display;
> u8 basedie;
> };
>
> --
> 2.39.2
>
--
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation
