Skip to content

Commit f9be300

Browse files
committed
drm/i915/gt: nuke unused legacy engine hw_id
The engine hw_id is only used by RING_FAULT_REG(), which is not used by GRAPHICS_VER >= 8. We did use hw_id on recent platforms to set the engine's guc_id, but that is not the case anymore since commit c784e52 ("drm/i915/guc: Update to use firmware v49.0.1"): now we only use class and id information to generate guc_id. We tend to keep adding new defines just to be consistent, but let's try to remove them and let them defined to 0 for engines that only exist on gen8+ platforms. v2: Reword commit message and add information about when we stopped using hw_id (Matt Roper) Signed-off-by: Lucas De Marchi <[email protected]> Reviewed-by: Tvrtko Ursulin <[email protected]> Reviewed-by: Matt Roper <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 7894375 commit f9be300

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

drivers/gpu/drm/i915/gt/intel_engine_cs.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ static const struct engine_info intel_engines[] = {
8080
},
8181
},
8282
[VCS1] = {
83-
.hw_id = VCS1_HW,
8483
.class = VIDEO_DECODE_CLASS,
8584
.instance = 1,
8685
.mmio_bases = {
@@ -89,15 +88,13 @@ static const struct engine_info intel_engines[] = {
8988
},
9089
},
9190
[VCS2] = {
92-
.hw_id = VCS2_HW,
9391
.class = VIDEO_DECODE_CLASS,
9492
.instance = 2,
9593
.mmio_bases = {
9694
{ .graphics_ver = 11, .base = GEN11_BSD3_RING_BASE }
9795
},
9896
},
9997
[VCS3] = {
100-
.hw_id = VCS3_HW,
10198
.class = VIDEO_DECODE_CLASS,
10299
.instance = 3,
103100
.mmio_bases = {
@@ -114,7 +111,6 @@ static const struct engine_info intel_engines[] = {
114111
},
115112
},
116113
[VECS1] = {
117-
.hw_id = VECS1_HW,
118114
.class = VIDEO_ENHANCEMENT_CLASS,
119115
.instance = 1,
120116
.mmio_bases = {

drivers/gpu/drm/i915/gt/intel_engine_types.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434
#define VCS0_HW 1
3535
#define BCS0_HW 2
3636
#define VECS0_HW 3
37-
#define VCS1_HW 4
38-
#define VCS2_HW 6
39-
#define VCS3_HW 7
40-
#define VECS1_HW 12
4137

4238
/* Gen11+ HW Engine class + instance */
4339
#define RENDER_CLASS 0

0 commit comments

Comments
 (0)