| Message ID | 20210720232014.3302645-3-lucas.demarchi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Nuke legacy hw_id | expand |
On 21/07/2021 00:20, Lucas De Marchi wrote: > The engine hw_id is only used by RING_FAULT_REG(), which is not used > since GRAPHICS_VER == 8. We tend to keep adding new defines just to be > consistent, but let's try to remove them and let them defined to 0 when > not used. > > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> > --- > drivers/gpu/drm/i915/gt/intel_engine_cs.c | 4 ---- > drivers/gpu/drm/i915/gt/intel_engine_types.h | 4 ---- > 2 files changed, 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c > index d561573ed98c..a11f69f2e46e 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c > +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c > @@ -80,7 +80,6 @@ static const struct engine_info intel_engines[] = { > }, > }, > [VCS1] = { > - .hw_id = VCS1_HW, > .class = VIDEO_DECODE_CLASS, > .instance = 1, > .mmio_bases = { > @@ -89,7 +88,6 @@ static const struct engine_info intel_engines[] = { > }, > }, > [VCS2] = { > - .hw_id = VCS2_HW, > .class = VIDEO_DECODE_CLASS, > .instance = 2, > .mmio_bases = { > @@ -97,7 +95,6 @@ static const struct engine_info intel_engines[] = { > }, > }, > [VCS3] = { > - .hw_id = VCS3_HW, > .class = VIDEO_DECODE_CLASS, > .instance = 3, > .mmio_bases = { > @@ -114,7 +111,6 @@ static const struct engine_info intel_engines[] = { > }, > }, > [VECS1] = { > - .hw_id = VECS1_HW, > .class = VIDEO_ENHANCEMENT_CLASS, > .instance = 1, > .mmio_bases = { > diff --git a/drivers/gpu/drm/i915/gt/intel_engine_types.h b/drivers/gpu/drm/i915/gt/intel_engine_types.h > index 1cb9c3b70b29..a107eb58ffa2 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine_types.h > +++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h > @@ -34,10 +34,6 @@ > #define VCS0_HW 1 > #define BCS0_HW 2 > #define VECS0_HW 3 > -#define VCS1_HW 4 > -#define VCS2_HW 6 > -#define VCS3_HW 7 > -#define VECS1_HW 12 > > /* Gen11+ HW Engine class + instance */ > #define RENDER_CLASS 0 > Story checks out AFAICS. Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Regards, Tvrtko
On Tue, Jul 20, 2021 at 04:20:12PM -0700, Lucas De Marchi wrote: > The engine hw_id is only used by RING_FAULT_REG(), which is not used > since GRAPHICS_VER == 8. We tend to keep adding new defines just to be > consistent, but let's try to remove them and let them defined to 0 when > not used. s/when not used/for engines that only exist on gen8+ platforms/ Reviewed-by: Matt Roper <matthew.d.roper@intel.com> For historical reference, we did use hw_id on gen8+ platforms too until relatively recently --- it was used to set the engine's guc_id as well up until: commit c784e5249e773689e38d2bc1749f08b986621a26 Author: John Harrison <John.C.Harrison@Intel.com> Date: Wed Oct 28 07:58:24 2020 -0700 drm/i915/guc: Update to use firmware v49.0.1 Matt > > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> > --- > drivers/gpu/drm/i915/gt/intel_engine_cs.c | 4 ---- > drivers/gpu/drm/i915/gt/intel_engine_types.h | 4 ---- > 2 files changed, 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c > index d561573ed98c..a11f69f2e46e 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c > +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c > @@ -80,7 +80,6 @@ static const struct engine_info intel_engines[] = { > }, > }, > [VCS1] = { > - .hw_id = VCS1_HW, > .class = VIDEO_DECODE_CLASS, > .instance = 1, > .mmio_bases = { > @@ -89,7 +88,6 @@ static const struct engine_info intel_engines[] = { > }, > }, > [VCS2] = { > - .hw_id = VCS2_HW, > .class = VIDEO_DECODE_CLASS, > .instance = 2, > .mmio_bases = { > @@ -97,7 +95,6 @@ static const struct engine_info intel_engines[] = { > }, > }, > [VCS3] = { > - .hw_id = VCS3_HW, > .class = VIDEO_DECODE_CLASS, > .instance = 3, > .mmio_bases = { > @@ -114,7 +111,6 @@ static const struct engine_info intel_engines[] = { > }, > }, > [VECS1] = { > - .hw_id = VECS1_HW, > .class = VIDEO_ENHANCEMENT_CLASS, > .instance = 1, > .mmio_bases = { > diff --git a/drivers/gpu/drm/i915/gt/intel_engine_types.h b/drivers/gpu/drm/i915/gt/intel_engine_types.h > index 1cb9c3b70b29..a107eb58ffa2 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine_types.h > +++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h > @@ -34,10 +34,6 @@ > #define VCS0_HW 1 > #define BCS0_HW 2 > #define VECS0_HW 3 > -#define VCS1_HW 4 > -#define VCS2_HW 6 > -#define VCS3_HW 7 > -#define VECS1_HW 12 > > /* Gen11+ HW Engine class + instance */ > #define RENDER_CLASS 0 > -- > 2.31.1 >
On Wed, Jul 21, 2021 at 03:47:22PM -0700, Matt Roper wrote: >On Tue, Jul 20, 2021 at 04:20:12PM -0700, Lucas De Marchi wrote: >> The engine hw_id is only used by RING_FAULT_REG(), which is not used >> since GRAPHICS_VER == 8. We tend to keep adding new defines just to be >> consistent, but let's try to remove them and let them defined to 0 when >> not used. > >s/when not used/for engines that only exist on gen8+ platforms/ > >Reviewed-by: Matt Roper <matthew.d.roper@intel.com> > >For historical reference, we did use hw_id on gen8+ platforms too until >relatively recently --- it was used to set the engine's guc_id as well >up until: > > commit c784e5249e773689e38d2bc1749f08b986621a26 > Author: John Harrison <John.C.Harrison@Intel.com> > Date: Wed Oct 28 07:58:24 2020 -0700 > > drm/i915/guc: Update to use firmware v49.0.1 thanks for digging this, I will add that to the commit message as well. Lucas De Marchi
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c index d561573ed98c..a11f69f2e46e 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c @@ -80,7 +80,6 @@ static const struct engine_info intel_engines[] = { }, }, [VCS1] = { - .hw_id = VCS1_HW, .class = VIDEO_DECODE_CLASS, .instance = 1, .mmio_bases = { @@ -89,7 +88,6 @@ static const struct engine_info intel_engines[] = { }, }, [VCS2] = { - .hw_id = VCS2_HW, .class = VIDEO_DECODE_CLASS, .instance = 2, .mmio_bases = { @@ -97,7 +95,6 @@ static const struct engine_info intel_engines[] = { }, }, [VCS3] = { - .hw_id = VCS3_HW, .class = VIDEO_DECODE_CLASS, .instance = 3, .mmio_bases = { @@ -114,7 +111,6 @@ static const struct engine_info intel_engines[] = { }, }, [VECS1] = { - .hw_id = VECS1_HW, .class = VIDEO_ENHANCEMENT_CLASS, .instance = 1, .mmio_bases = { diff --git a/drivers/gpu/drm/i915/gt/intel_engine_types.h b/drivers/gpu/drm/i915/gt/intel_engine_types.h index 1cb9c3b70b29..a107eb58ffa2 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_types.h +++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h @@ -34,10 +34,6 @@ #define VCS0_HW 1 #define BCS0_HW 2 #define VECS0_HW 3 -#define VCS1_HW 4 -#define VCS2_HW 6 -#define VCS3_HW 7 -#define VECS1_HW 12 /* Gen11+ HW Engine class + instance */ #define RENDER_CLASS 0
The engine hw_id is only used by RING_FAULT_REG(), which is not used since GRAPHICS_VER == 8. We tend to keep adding new defines just to be consistent, but let's try to remove them and let them defined to 0 when not used. Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 4 ---- drivers/gpu/drm/i915/gt/intel_engine_types.h | 4 ---- 2 files changed, 8 deletions(-)