tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/xe: remove display stepping handling
The code is now unused. Remove.
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/19bc7a3197f2bc6f3c0d337487ab19f3b7f5612a.1724180287.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+27
-37
+1
-2
drivers/gpu/drm/xe/xe_debugfs.c
+1
-2
drivers/gpu/drm/xe/xe_debugfs.c
···
47
47
48
48
drm_printf(&p, "graphics_verx100 %d\n", xe->info.graphics_verx100);
49
49
drm_printf(&p, "media_verx100 %d\n", xe->info.media_verx100);
50
-
drm_printf(&p, "stepping G:%s M:%s D:%s B:%s\n",
50
+
drm_printf(&p, "stepping G:%s M:%s B:%s\n",
51
51
xe_step_name(xe->info.step.graphics),
52
52
xe_step_name(xe->info.step.media),
53
-
xe_step_name(xe->info.step.display),
54
53
xe_step_name(xe->info.step.basedie));
55
54
drm_printf(&p, "is_dgfx %s\n", str_yes_no(xe->info.is_dgfx));
56
55
drm_printf(&p, "platform %d\n", xe->info.platform);
+1
-2
drivers/gpu/drm/xe/xe_pci.c
+1
-2
drivers/gpu/drm/xe/xe_pci.c
···
830
830
xe->info.dma_mask_size, xe->info.tile_count,
831
831
xe->info.has_heci_gscfi);
832
832
833
-
drm_dbg(&xe->drm, "Stepping = (G:%s, M:%s, D:%s, B:%s)\n",
833
+
drm_dbg(&xe->drm, "Stepping = (G:%s, M:%s, B:%s)\n",
834
834
xe_step_name(xe->info.step.graphics),
835
835
xe_step_name(xe->info.step.media),
836
-
xe_step_name(xe->info.step.display),
837
836
xe_step_name(xe->info.step.basedie));
838
837
839
838
drm_dbg(&xe->drm, "SR-IOV support: %s (mode: %s)\n",
+25
-32
drivers/gpu/drm/xe/xe_step.c
+25
-32
drivers/gpu/drm/xe/xe_step.c
···
28
28
* use a macro to define these to make it easier to identify the platforms
29
29
* where the two steppings can deviate.
30
30
*/
31
-
#define COMMON_GT_MEDIA_STEP(x_) \
31
+
#define COMMON_STEP(x_) \
32
32
.graphics = STEP_##x_, \
33
33
.media = STEP_##x_
34
-
35
-
#define COMMON_STEP(x_) \
36
-
COMMON_GT_MEDIA_STEP(x_), \
37
-
.graphics = STEP_##x_, \
38
-
.media = STEP_##x_, \
39
-
.display = STEP_##x_
40
34
41
35
__diag_push();
42
36
__diag_ignore_all("-Woverride-init", "Allow field overrides in table");
43
37
44
38
/* Same GT stepping between tgl_uy_revids and tgl_revids don't mean the same HW */
45
39
static const struct xe_step_info tgl_revids[] = {
46
-
[0] = { COMMON_GT_MEDIA_STEP(A0), .display = STEP_B0 },
47
-
[1] = { COMMON_GT_MEDIA_STEP(B0), .display = STEP_D0 },
40
+
[0] = { COMMON_STEP(A0) },
41
+
[1] = { COMMON_STEP(B0) },
48
42
};
49
43
50
44
static const struct xe_step_info dg1_revids[] = {
···
47
53
};
48
54
49
55
static const struct xe_step_info adls_revids[] = {
50
-
[0x0] = { COMMON_GT_MEDIA_STEP(A0), .display = STEP_A0 },
51
-
[0x1] = { COMMON_GT_MEDIA_STEP(A0), .display = STEP_A2 },
52
-
[0x4] = { COMMON_GT_MEDIA_STEP(B0), .display = STEP_B0 },
53
-
[0x8] = { COMMON_GT_MEDIA_STEP(C0), .display = STEP_B0 },
54
-
[0xC] = { COMMON_GT_MEDIA_STEP(D0), .display = STEP_C0 },
56
+
[0x0] = { COMMON_STEP(A0) },
57
+
[0x1] = { COMMON_STEP(A0) },
58
+
[0x4] = { COMMON_STEP(B0) },
59
+
[0x8] = { COMMON_STEP(C0) },
60
+
[0xC] = { COMMON_STEP(D0) },
55
61
};
56
62
57
63
static const struct xe_step_info adls_rpls_revids[] = {
58
-
[0x4] = { COMMON_GT_MEDIA_STEP(D0), .display = STEP_D0 },
59
-
[0xC] = { COMMON_GT_MEDIA_STEP(D0), .display = STEP_C0 },
64
+
[0x4] = { COMMON_STEP(D0) },
65
+
[0xC] = { COMMON_STEP(D0) },
60
66
};
61
67
62
68
static const struct xe_step_info adlp_revids[] = {
63
-
[0x0] = { COMMON_GT_MEDIA_STEP(A0), .display = STEP_A0 },
64
-
[0x4] = { COMMON_GT_MEDIA_STEP(B0), .display = STEP_B0 },
65
-
[0x8] = { COMMON_GT_MEDIA_STEP(C0), .display = STEP_C0 },
66
-
[0xC] = { COMMON_GT_MEDIA_STEP(C0), .display = STEP_D0 },
69
+
[0x0] = { COMMON_STEP(A0) },
70
+
[0x4] = { COMMON_STEP(B0) },
71
+
[0x8] = { COMMON_STEP(C0) },
72
+
[0xC] = { COMMON_STEP(C0) },
67
73
};
68
74
69
75
static const struct xe_step_info adlp_rpl_revids[] = {
70
-
[0x4] = { COMMON_GT_MEDIA_STEP(C0), .display = STEP_E0 },
76
+
[0x4] = { COMMON_STEP(C0) },
71
77
};
72
78
73
79
static const struct xe_step_info adln_revids[] = {
74
-
[0x0] = { COMMON_GT_MEDIA_STEP(A0), .display = STEP_D0 },
80
+
[0x0] = { COMMON_STEP(A0) },
75
81
};
76
82
77
83
static const struct xe_step_info dg2_g10_revid_step_tbl[] = {
78
-
[0x0] = { COMMON_GT_MEDIA_STEP(A0), .display = STEP_A0 },
79
-
[0x1] = { COMMON_GT_MEDIA_STEP(A1), .display = STEP_A0 },
80
-
[0x4] = { COMMON_GT_MEDIA_STEP(B0), .display = STEP_B0 },
81
-
[0x8] = { COMMON_GT_MEDIA_STEP(C0), .display = STEP_C0 },
84
+
[0x0] = { COMMON_STEP(A0) },
85
+
[0x1] = { COMMON_STEP(A1) },
86
+
[0x4] = { COMMON_STEP(B0) },
87
+
[0x8] = { COMMON_STEP(C0) },
82
88
};
83
89
84
90
static const struct xe_step_info dg2_g11_revid_step_tbl[] = {
85
-
[0x0] = { COMMON_GT_MEDIA_STEP(A0), .display = STEP_B0 },
86
-
[0x4] = { COMMON_GT_MEDIA_STEP(B0), .display = STEP_C0 },
87
-
[0x5] = { COMMON_GT_MEDIA_STEP(B1), .display = STEP_C0 },
91
+
[0x0] = { COMMON_STEP(A0) },
92
+
[0x4] = { COMMON_STEP(B0) },
93
+
[0x5] = { COMMON_STEP(B1) },
88
94
};
89
95
90
96
static const struct xe_step_info dg2_g12_revid_step_tbl[] = {
91
-
[0x0] = { COMMON_GT_MEDIA_STEP(A0), .display = STEP_C0 },
92
-
[0x1] = { COMMON_GT_MEDIA_STEP(A1), .display = STEP_C0 },
97
+
[0x0] = { COMMON_STEP(A0) },
98
+
[0x1] = { COMMON_STEP(A1) },
93
99
};
94
100
95
101
static const struct xe_step_info pvc_revid_step_tbl[] = {
···
189
195
} else {
190
196
drm_dbg(&xe->drm, "Using future steppings\n");
191
197
step.graphics = STEP_FUTURE;
192
-
step.display = STEP_FUTURE;
193
198
}
194
199
}
195
200