On Thu, Sep 16, 2021 at 10:27:41AM -0700, John Harrison wrote:
> On 9/16/2021 01:59, Petri Latvala wrote:
> > On Wed, Sep 15, 2021 at 02:55:58PM -0700, John.C.Harrison@xxxxxxxxx wrote:
> > > From: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
> > >
> > > Newer platforms have an embedded table giving details about that
> > > platform's hardware configuration. This table can be retrieved from
> > > the KMD via the existing query API. So add a test for it as both an
> > > example of how to fetch the table and to validate the contents as much
> > > as is possible.
> > >
> > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
> > > Signed-off-by: John Harrison <John.C.Harrison@xxxxxxxxx>
> > > Cc: Slawomir Milczarek <slawomir.milczarek@xxxxxxxxx>
> > > Reviewed-by: Matthew Brost <matthew.brost@xxxxxxxxx>
> > > ---
> > > include/drm-uapi/i915_drm.h | 1 +
> > > lib/intel_hwconfig_types.h | 106 +++++++++++++++++++++++
> > > tests/i915/i915_query.c | 168 ++++++++++++++++++++++++++++++++++++
> > > 3 files changed, 275 insertions(+)
> > > create mode 100644 lib/intel_hwconfig_types.h
> > >
> > > diff --git a/include/drm-uapi/i915_drm.h b/include/drm-uapi/i915_drm.h
> > > index b9632bb2c..ae0c8dfad 100644
> > > --- a/include/drm-uapi/i915_drm.h
> > > +++ b/include/drm-uapi/i915_drm.h
> > > @@ -2451,6 +2451,7 @@ struct drm_i915_query_item {
> > > #define DRM_I915_QUERY_ENGINE_INFO 2
> > > #define DRM_I915_QUERY_PERF_CONFIG 3
> > > #define DRM_I915_QUERY_MEMORY_REGIONS 4
> > > +#define DRM_I915_QUERY_HWCONFIG_TABLE 5
> > > /* Must be kept compact -- no holes and well documented */
> > Please update i915_drm.h with a copy from the kernel and state in the
> > commit message which kernel commit sha it's from. If this change is
> > not in the kernel yet, add this token to lib/i915/i915_drm_local.h
> > instead.
> >
> >
> Neither side is merged yet. My understanding is that all sides need to be
> posted in parallel for CI to work. Once green and reviewed, the kernel side
> gets merged first. Then the IGT/UMD patches get updated with the official
> kernel headers, reposted and then merged.
That lockstep dancing removal is the point of i915_drm_local.h. IGT
side can even be merged that way before kernel side is ready, then
updated with the real thing later at whatever cadence.
--
Petri Latvala
