From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 92D116E1A8 for ; Tue, 13 Apr 2021 03:54:04 +0000 (UTC) Received: by mail-pl1-x62a.google.com with SMTP id z22so2358216plo.3 for ; Mon, 12 Apr 2021 20:54:04 -0700 (PDT) From: Jason Ekstrand Date: Mon, 12 Apr 2021 22:52:42 -0500 Message-Id: <20210413035350.261794-7-jason@jlekstrand.net> In-Reply-To: <20210413035350.261794-1-jason@jlekstrand.net> References: <20210413035350.261794-1-jason@jlekstrand.net> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 06/74] lib/i915/gem_engine_topology: Expose the __query_engines helper 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: igt-dev@lists.freedesktop.org List-ID: --- 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@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev