[igt-dev] [PATCH i-g-t 06/74] lib/i915/gem_engine_topology: Expose the __query_engines helper

[Jason Ekstrand]

On Thu, Apr 15, 2021 at 11:06 AM Daniel Vetter <daniel at ffwll.ch> wrote:
>
> On Mon, Apr 12, 2021 at 10:52:42PM -0500, Jason Ekstrand wrote:
>
> gtkdoc + sob then Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

Would it make sense to move it to ioctl_wrappers.c/h?  It seems like
it makes more sense there in some ways.  I guess it's also
topology-related.

--Jason

> > ---
> >  lib/i915/gem_engine_topology.c | 20 +++++++++++---------
> >  lib/i915/gem_engine_topology.h |  4 ++++
> >  2 files changed, 15 insertions(+), 9 deletions(-)
> >
> > diff --git a/lib/i915/gem_engine_topology.c b/lib/i915/gem_engine_topology.c
> > index c12cd920..5d196f59 100644
> > --- a/lib/i915/gem_engine_topology.c
> > +++ b/lib/i915/gem_engine_topology.c
> > @@ -62,14 +62,9 @@ static int __gem_query(int fd, struct drm_i915_query *q)
> >       return err;
> >  }
> >
> > -static void gem_query(int fd, struct drm_i915_query *q)
> > -{
> > -     igt_assert_eq(__gem_query(fd, q), 0);
> > -}
> > -
> > -static void query_engines(int fd,
> > -                       struct drm_i915_query_engine_info *query_engines,
> > -                       int length)
> > +int __gem_query_engines(int fd,
> > +                     struct drm_i915_query_engine_info *query_engines,
> > +                     int length)
> >  {
> >       struct drm_i915_query_item item = { };
> >       struct drm_i915_query query = { };
> > @@ -81,7 +76,14 @@ static void query_engines(int fd,
> >
> >       item.data_ptr = to_user_pointer(query_engines);
> >
> > -     gem_query(fd, &query);
> > +     return __gem_query(fd, &query);
> > +}
> > +
> > +static void query_engines(int fd,
> > +                       struct drm_i915_query_engine_info *query_engines,
> > +                       int length)
> > +{
> > +     igt_assert_eq(__gem_query_engines(fd, query_engines, length), 0);
> >  }
> >
> >  static void ctx_map_engines(int fd, struct intel_engine_data *ed,
> > diff --git a/lib/i915/gem_engine_topology.h b/lib/i915/gem_engine_topology.h
> > index f5edcb5d..76b7cd4d 100644
> > --- a/lib/i915/gem_engine_topology.h
> > +++ b/lib/i915/gem_engine_topology.h
> > @@ -29,6 +29,10 @@
> >
> >  #define GEM_MAX_ENGINES              I915_EXEC_RING_MASK + 1
> >
> > +int __gem_query_engines(int fd,
> > +                     struct drm_i915_query_engine_info *query_engines,
> > +                     int length);
> > +
> >  struct intel_engine_data {
> >       uint32_t nengines;
> >       uint32_t n;
> > --
> > 2.31.1
> >
> > _______________________________________________
> > igt-dev mailing list
> > igt-dev at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/igt-dev
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch