public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t v2 1/1] tests/i915/pxp: PXP debugfs path promoted to global
@ 2022-12-15 17:43 Alan Previn
  2022-12-15 18:19 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v2,1/1] " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Alan Previn @ 2022-12-15 17:43 UTC (permalink / raw)
  To: igt-dev; +Cc: Alan Previn

As per recent kernel side update in preparation for
MTL, PXP is now a global i915 subsystem so let's update
the debugfs path to try both the legacy and new paths
before we fail.

Changes from prior rev:
   v1: - Fix a comment (Daniele)

Signed-off-by: Alan Previn <alan.previn.teres.alexis@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
---
 tests/i915/gem_pxp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/i915/gem_pxp.c b/tests/i915/gem_pxp.c
index ffad9b5a..41043df9 100644
--- a/tests/i915/gem_pxp.c
+++ b/tests/i915/gem_pxp.c
@@ -848,6 +848,14 @@ static void trigger_pxp_debugfs_forced_teardown(int i915)
 	char str[32];
 
 	fd = igt_debugfs_open(i915, "gt/pxp/terminate_state", O_RDWR);
+	/*
+	 * On newer kernels, we promoted PXP to be a global i915 subsystem,
+	 * so try again with a top-level path if we failed at the gt path.
+	 * If we still fail, then we assert out.
+	 */
+	if (fd < 0)
+		fd = igt_debugfs_open(i915, "pxp/terminate_state", O_RDWR);
+
 	igt_assert_f(fd >= 0, "Can't open pxp termination debugfs\n");
 	ret = snprintf(str, sizeof(str), "0x1");
 	igt_assert(ret > 2 && ret < sizeof(str));

base-commit: c001793d5f22deb01918b6ba52af829794582df1
-- 
2.34.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [igt-dev] [PATCH i-g-t v2 1/1] tests/i915/pxp: PXP debugfs path promoted to global
@ 2022-12-19 19:20 Alan Previn
  0 siblings, 0 replies; 5+ messages in thread
From: Alan Previn @ 2022-12-19 19:20 UTC (permalink / raw)
  To: igt-dev; +Cc: Alan Previn

As per recent kernel side update in preparation for
MTL, PXP is now a global i915 subsystem so let's update
the debugfs path to try both the legacy and new paths
before we fail.

Changes from prior rev:
   v1: - Fix a comment (Daniele)

Signed-off-by: Alan Previn <alan.previn.teres.alexis@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
---
 tests/i915/gem_pxp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/i915/gem_pxp.c b/tests/i915/gem_pxp.c
index ffad9b5a..41043df9 100644
--- a/tests/i915/gem_pxp.c
+++ b/tests/i915/gem_pxp.c
@@ -848,6 +848,14 @@ static void trigger_pxp_debugfs_forced_teardown(int i915)
 	char str[32];
 
 	fd = igt_debugfs_open(i915, "gt/pxp/terminate_state", O_RDWR);
+	/*
+	 * On newer kernels, we promoted PXP to be a global i915 subsystem,
+	 * so try again with a top-level path if we failed at the gt path.
+	 * If we still fail, then we assert out.
+	 */
+	if (fd < 0)
+		fd = igt_debugfs_open(i915, "pxp/terminate_state", O_RDWR);
+
 	igt_assert_f(fd >= 0, "Can't open pxp termination debugfs\n");
 	ret = snprintf(str, sizeof(str), "0x1");
 	igt_assert(ret > 2 && ret < sizeof(str));

base-commit: c001793d5f22deb01918b6ba52af829794582df1
-- 
2.34.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-12-19 19:18 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-15 17:43 [igt-dev] [PATCH i-g-t v2 1/1] tests/i915/pxp: PXP debugfs path promoted to global Alan Previn
2022-12-15 18:19 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v2,1/1] " Patchwork
2022-12-15 18:30 ` [igt-dev] [PATCH i-g-t v2 1/1] " Dixit, Ashutosh
2022-12-16 14:14 ` [igt-dev] ✓ Fi.CI.IGT: success for series starting with [i-g-t,v2,1/1] " Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2022-12-19 19:20 [igt-dev] [PATCH i-g-t v2 1/1] " Alan Previn

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox