Thanks, applied as 355818a093157d3aef8ac4d619cd69bd5fb18179. Michael
[sent from post-receive hook] On Sat, 17 May 2025 00:02:49 +0200, Philipp Zabel <[email protected]> wrote: > Signed-off-by: Philipp Zabel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/igt-gpu-tools-1.30/0001-lib-igt_aux-since-procps-ng-4.0.5-PIDS_VAL-takes-3-a.patch > > b/patches/igt-gpu-tools-1.30/0001-lib-igt_aux-since-procps-ng-4.0.5-PIDS_VAL-takes-3-a.patch > deleted file mode 100644 > index 5dd5d5801e03..000000000000 > --- > a/patches/igt-gpu-tools-1.30/0001-lib-igt_aux-since-procps-ng-4.0.5-PIDS_VAL-takes-3-a.patch > +++ /dev/null > @@ -1,66 +0,0 @@ > -From: Thomas Petazzoni <[email protected]> > -Date: Fri, 3 Jan 2025 23:26:28 +0100 > -Subject: [PATCH] lib/igt_aux: since procps-ng 4.0.5, PIDS_VAL() takes 3 > - arguments, not 4 > - > -Unfortunately, the API of procps-ng has changed between procps-ng > -4.0.4 and procps-ng 4.0.5, with the PIDS_VAL() macro changing in > -upstream commit > -https://gitlab.com/procps-ng/procps/-/commit/967fdcfb06e20aad0f31073474cb94545c9bdea5 > -"library: expunge that 'info' parameter in 'VAL' macros" > - > -This API breakage has been reported upstream as of > -https://gitlab.com/procps-ng/procps/-/issues/366 > -but in the mean time, the build of igt-gpu-tools breaks with: > - > -../lib/igt_aux.c:1358:78: error: macro "PIDS_VAL" passed 4 arguments, but > takes just 3 > - > -We fix this by detecting the version of the libproc2 library, and > -adjusting accordingly how PIDS_VAL() gets used. > - > -Cc: DeX77 <[email protected]> > -Cc: Jim Warner <[email protected]> > -Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/164 > -Signed-off-by: Thomas Petazzoni <[email protected]> > -Reviewed-by: Jonathan Cavitt <[email protected]> > ---- > - lib/igt_aux.c | 7 +++++++ > - meson.build | 3 +++ > - 2 files changed, 10 insertions(+) > - > -diff --git a/lib/igt_aux.c b/lib/igt_aux.c > -index 3407cc4f2aef..f5bf48da642b 100644 > ---- a/lib/igt_aux.c > -+++ b/lib/igt_aux.c > -@@ -1358,10 +1358,17 @@ static bool get_process_ids(struct igt_process *prcs) > - prcs->comm = NULL; > - prcs->stack = procps_pids_get(prcs->info, PIDS_FETCH_TASKS_ONLY); > - if (prcs->stack) { > -+#if defined(HAVE_LIBPROC2_POST_4_0_5_API) > -+ prcs->tid = PIDS_VAL(EU_PID, s_int, prcs->stack); > -+ prcs->euid = PIDS_VAL(EU_EUID, s_int, prcs->stack); > -+ prcs->egid = PIDS_VAL(EU_EGID, s_int, prcs->stack); > -+ prcs->comm = PIDS_VAL(EU_CMD, str, prcs->stack); > -+#else > - prcs->tid = PIDS_VAL(EU_PID, s_int, prcs->stack, prcs->info); > - prcs->euid = PIDS_VAL(EU_EUID, s_int, prcs->stack, prcs->info); > - prcs->egid = PIDS_VAL(EU_EGID, s_int, prcs->stack, prcs->info); > - prcs->comm = PIDS_VAL(EU_CMD, str, prcs->stack, prcs->info); > -+#endif > - } > - #endif > - return prcs->tid != 0; > -diff --git a/meson.build b/meson.build > -index ed2a79d5a2d9..2f663dc03737 100644 > ---- a/meson.build > -+++ b/meson.build > -@@ -139,6 +139,9 @@ if libprocps.found() > - config.set('HAVE_LIBPROCPS', 1) > - elif libproc2.found() > - config.set('HAVE_LIBPROC2', 1) > -+ if libproc2.version().version_compare('>= 4.0.5') > -+ config.set('HAVE_LIBPROC2_POST_4_0_5_API', 1) > -+ endif > - else > - error('Either libprocps or libproc2 is required') > - endif > diff --git a/patches/igt-gpu-tools-1.30/series > b/patches/igt-gpu-tools-1.30/series > deleted file mode 100644 > index 67bd0bbce463..000000000000 > --- a/patches/igt-gpu-tools-1.30/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-lib-igt_aux-since-procps-ng-4.0.5-PIDS_VAL-takes-3-a.patch > -# 1ccf3af41d04e1f9360b59bb14131a6f - git-ptx-patches magic > diff --git a/rules/igt-gpu-tools.make b/rules/igt-gpu-tools.make > index 3f963ea31718..1097fd2f7875 100644 > --- a/rules/igt-gpu-tools.make > +++ b/rules/igt-gpu-tools.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_IGT_GPU_TOOLS) += igt-gpu-tools > # > # Paths and names > # > -IGT_GPU_TOOLS_VERSION := 1.30 > -IGT_GPU_TOOLS_MD5 := 10706e68a57f464408d309ae74bec5e2 > +IGT_GPU_TOOLS_VERSION := 2.0 > +IGT_GPU_TOOLS_MD5 := dfd4dd415c3b3e53ddf4d13f4164a62b > IGT_GPU_TOOLS := igt-gpu-tools-$(IGT_GPU_TOOLS_VERSION) > IGT_GPU_TOOLS_SUFFIX := tar.xz > IGT_GPU_TOOLS_URL := $(call ptx/mirror, XORG, > individual/app/$(IGT_GPU_TOOLS).$(IGT_GPU_TOOLS_SUFFIX)) > @@ -95,6 +95,7 @@ $(STATEDIR)/igt-gpu-tools.targetinstall: > > ifdef PTXCONF_IGT_GPU_TOOLS_INTEL > @$(call install_lib, igt-gpu-tools, 0, 0, 0644, libi915_perf) > + @$(call install_lib, igt-gpu-tools, 0, 0, 0644, libxe_oa) > > @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, > /usr/bin/i915-perf-configs) > @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, > /usr/bin/i915-perf-control) > @@ -133,6 +134,10 @@ ifdef PTXCONF_IGT_GPU_TOOLS_INTEL > @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, > /usr/bin/intel_stepping) > @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, > /usr/bin/intel_vbt_decode) > @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, > /usr/bin/intel_watermark) > + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, > /usr/bin/xe-perf-configs) > + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, > /usr/bin/xe-perf-control) > + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, > /usr/bin/xe-perf-reader) > + @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, > /usr/bin/xe-perf-recorder) > > @$(call install_tree, igt-gpu-tools, 0, 0, -, > /usr/share/igt-gpu-tools/registers) > endif
