From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 341586EA80 for ; Thu, 15 Apr 2021 15:56:18 +0000 (UTC) Received: by mail-wm1-x32d.google.com with SMTP id n127so947617wmb.5 for ; Thu, 15 Apr 2021 08:56:18 -0700 (PDT) Date: Thu, 15 Apr 2021 17:56:14 +0200 From: Daniel Vetter Message-ID: References: <20210413035350.261794-1-jason@jlekstrand.net> <20210413035350.261794-11-jason@jlekstrand.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210413035350.261794-11-jason@jlekstrand.net> Subject: Re: [igt-dev] [PATCH i-g-t 10/74] lib/i915/gem_engine_topology: Factor out static engine listing List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: Jason Ekstrand Cc: igt-dev@lists.freedesktop.org List-ID: On Mon, Apr 12, 2021 at 10:52:46PM -0500, Jason Ekstrand wrote: +sob, then Acked-by: Daniel Vetter > --- > lib/i915/gem_engine_topology.c | 51 +++++++++++++++++++--------------- > 1 file changed, 29 insertions(+), 22 deletions(-) > > diff --git a/lib/i915/gem_engine_topology.c b/lib/i915/gem_engine_topology.c > index 833b3abe..606d3c1d 100644 > --- a/lib/i915/gem_engine_topology.c > +++ b/lib/i915/gem_engine_topology.c > @@ -196,6 +196,34 @@ intel_get_current_physical_engine(struct intel_engine_data *ed) > return e; > } > > +static struct intel_engine_data intel_engine_list_for_static(int fd) > +{ > + const struct intel_execution_engine2 *e2; > + struct intel_engine_data engine_data = { }; > + > + igt_debug("using pre-allocated engine list\n"); > + > + __for_each_static_engine(e2) { > + if (igt_only_list_subtests() || > + (fd < 0) || > + gem_has_ring(fd, e2->flags)) { > + struct intel_execution_engine2 *__e2 = > + &engine_data.engines[ > + engine_data.nengines]; > + > + strcpy(__e2->name, e2->name); > + __e2->instance = e2->instance; > + __e2->class = e2->class; > + __e2->flags = e2->flags; > + __e2->is_virtual = false; > + > + engine_data.nengines++; > + } > + } > + > + return engine_data; > +} > + > static int gem_topology_get_param(int fd, > struct drm_i915_gem_context_param *p) > { > @@ -216,28 +244,7 @@ struct intel_engine_data intel_init_engine_list(int fd, uint32_t ctx_id) > > if (gem_topology_get_param(fd, ¶m)) { > /* if kernel does not support engine/context mapping */ > - const struct intel_execution_engine2 *e2; > - > - igt_debug("using pre-allocated engine list\n"); > - > - __for_each_static_engine(e2) { > - if (igt_only_list_subtests() || > - (fd < 0) || > - gem_has_ring(fd, e2->flags)) { > - struct intel_execution_engine2 *__e2 = > - &engine_data.engines[ > - engine_data.nengines]; > - > - strcpy(__e2->name, e2->name); > - __e2->instance = e2->instance; > - __e2->class = e2->class; > - __e2->flags = e2->flags; > - __e2->is_virtual = false; > - > - engine_data.nengines++; > - } > - } > - return engine_data; > + return intel_engine_list_for_static(fd); > } > > if (!param.size) { > -- > 2.31.1 > > _______________________________________________ > igt-dev mailing list > igt-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/igt-dev -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev