[PATCH i-g-t] tests/intel: Remove debugfs_test and xe_debugfs

Peter Senna Tschudin peter.senna at linux.intel.com
Thu Apr 3 10:23:12 UTC 2025


With the introduction of intel_sysfs_debugfs both debugfs_test and
xe_debugfs became redundant. It is also important to notice that
igt at debugfs_test@basic-hwmon was already redundant because intel_hwmon
covers both i915 and Xe. So:
 - remove debugfs_test
 - remove xe_debugfs
 - update meson.build
 - update code_coverage.md and code_cov_selftest.sh to use
   igt at intel_sysfs_debugfs@i915-debugfs-read-all-entries
 - update fast-feedback.testlist to use intel_sysfs_debugfs and
   intel_hwmon
 - update xe-fast-feedback.testlist to use intel_sysfs_debugfs and
   include xe-debugfs-read-all-entries and xe-sysfs-read-all-entries
 - update xe-sriov-vf.blocklist.txt to use intel_sysfs_debugfs
 - remove reference to debugfs_test.c from i915_test_config.json

Cc: himanshu.girotra at intel.com
Cc: aditya.chauhan at intel.com
Cc: pravalika.gurram at intel.com
Cc: sai.gowtham.ch at intel.com
Cc: ramadevi.gandi at intel.com
Cc: lucas.demarchi at intel.com
Cc: rodrigo.vivi at intel.com
Cc: kamil.konieczny at linux.intel.com
Cc: katarzyna.piecielska at intel.com
Signed-off-by: Peter Senna Tschudin <peter.senna at linux.intel.com>
---
 docs/code_coverage.md                    |  18 +-
 scripts/code_cov_selftest.sh             |   2 +-
 tests/intel-ci/fast-feedback.testlist    |   6 +-
 tests/intel-ci/xe-fast-feedback.testlist |   8 +-
 tests/intel-ci/xe-sriov-vf.blocklist.txt |   2 +-
 tests/intel/debugfs_test.c               | 244 ---------------------
 tests/intel/i915_test_config.json        |   2 +-
 tests/intel/xe_debugfs.c                 | 268 -----------------------
 tests/meson.build                        |   2 -
 9 files changed, 20 insertions(+), 532 deletions(-)
 delete mode 100644 tests/intel/debugfs_test.c
 delete mode 100644 tests/intel/xe_debugfs.c

diff --git a/docs/code_coverage.md b/docs/code_coverage.md
index 915e800ed..031611e69 100644
--- a/docs/code_coverage.md
+++ b/docs/code_coverage.md
@@ -162,23 +162,23 @@ For each script, the igt_runner passes just one parameter: the results
 directory + the test name.
 
 For instance, if it is needed to run a test called
-`debugfs_test (read_all_entries)` using `code_cov_capture`
+`intel_sysfs_debugfs (i915-debugfs-read-all-entries)` using `code_cov_capture`
 parameter, e. g.:
 
 ```
-$ echo "igt at debugfs_test@read_all_entries" > my.testlist
+$ echo "igt at intel_sysfs_debugfs@i915-debugfs-read-all-entries" > my.testlist
 $ ./scripts/run-tests.sh -T my.testlist -k ~/linux -c code_cov_capture -P
 Found test list: "/basedir/igt/build/tests/test-list.txt"
-[31410.499969] [1/1] debugfs_test (read_all_entries)
+[31410.499969] [1/1] intel_sysfs_debugfs (i915-debugfs-read-all-entries)
 [31411.060446] Storing code coverage results...
-[31418.01]     Code coverage wrote to /basedir/igt/results/code_cov/debugfs_test_read_all_entries.info
+[31418.01]     Code coverage wrote to /basedir/igt/results/code_cov/intel_sysfs_debugfs_i915_debugfs_read_all_entries.info
 Done.
 ```
 
 The script will be called as:
 
 ```
-code_cov_capture results/code_cov/debugfs_test_read_all_entries
+code_cov_capture results/code_cov/intel_sysfs_debugfs_i915_debugfs_read_all_entries
 ```
 
 Please notice that any character that it is not a number nor a letter at the
@@ -376,7 +376,7 @@ OUT_DIR="${HOME}/results"
 
 mkdir -p $OUT_DIR/html
 
-echo "igt at debugfs_test@read_all_entries" > $TESTLIST
+echo "igt at intel_sysfs_debugfs@i915-debugfs-read-all-entries" > $TESTLIST
 echo "igt at core_auth@basic-auth" >> $TESTLIST
 echo "igt at gem_exec_basic@basic" >> $TESTLIST
 
@@ -401,8 +401,8 @@ genhtml -q -s --legend --branch-coverage $OUT_DIR/results.info
 Running such script produces the following output:
 
 ```
-[3622.993304] [1/3] debugfs_test (read_all_entries)
-[3631.95]     Code coverage wrote to results/code_cov/debugfs_test_read_all_entries.info
+[3622.993304] [1/3] intel_sysfs_debugfs (i915-debugfs-read-all-entries)
+[3631.95]     Code coverage wrote to results/code_cov/intel_sysfs_debugfs_i915_debugfs_read_all_entries.info
 [3626.217016] Storing code coverage results...
 [3631.957998] [2/3] core_auth (basic-auth)
 [3638.03]     Code coverage wrote to results/code_cov/core_auth_basic_auth.info
@@ -419,7 +419,7 @@ core_auth_basic_auth.info:
 Ignored......: non-drm headers and source files where none of its code ran.
 Source files.: 23.27% (165 of 709 total), 29.57% (165 of 558 filtered)
 
-debugfs_test_read_all_entries.info:
+intel_sysfs_debugfs_i915_debugfs_read_all_entries.info:
   lines......: 19.3% (20266 of 104802 lines)
   functions..: 17.5% (1922 of 10971 functions)
   branches...: 12.7% (9462 of 74555 branches)
diff --git a/scripts/code_cov_selftest.sh b/scripts/code_cov_selftest.sh
index c834fb5a7..bc5ef7458 100755
--- a/scripts/code_cov_selftest.sh
+++ b/scripts/code_cov_selftest.sh
@@ -13,7 +13,7 @@ if [ -z "$IGT_KERNEL_TREE" ] ; then
         exit 1
 fi
 
-TEST="igt at debugfs_test@read_all_entries"
+TEST="igt at intel_sysfs_debugfs@i915-debugfs-read-all-entries"
 
 TESTLIST="my_tests.testlist"
 GATHER="scripts/code_cov_gather_on_test.py"
diff --git a/tests/intel-ci/fast-feedback.testlist b/tests/intel-ci/fast-feedback.testlist
index be0965110..82395e7ea 100644
--- a/tests/intel-ci/fast-feedback.testlist
+++ b/tests/intel-ci/fast-feedback.testlist
@@ -3,9 +3,6 @@ igt at i915_module_load@load
 
 # Keep alphabetically sorted by default
 igt at core_auth@basic-auth
-igt at debugfs_test@read_all_entries
-igt at debugfs_test@basic-hwmon
-igt at debugfs_test@sysfs
 igt at fbdev@eof
 igt at fbdev@info
 igt at fbdev@nullptr
@@ -55,6 +52,9 @@ igt at i915_getparams_basic@basic-eu-total
 igt at i915_getparams_basic@basic-subslice-total
 igt at i915_hangman@error-state-basic
 igt at i915_pciid
+igt at intel_hwmon
+igt at intel_sysfs_debugfs@i915-debugfs-read-all-entries
+igt at intel_sysfs_debugfs@i915-sysfs-read-all-entries
 igt at kms_addfb_basic@addfb25-4-tiled
 igt at kms_addfb_basic@addfb25-bad-modifier
 igt at kms_addfb_basic@addfb25-framebuffer-vs-set-tiling
diff --git a/tests/intel-ci/xe-fast-feedback.testlist b/tests/intel-ci/xe-fast-feedback.testlist
index 0234d3e72..adc0c1b21 100644
--- a/tests/intel-ci/xe-fast-feedback.testlist
+++ b/tests/intel-ci/xe-fast-feedback.testlist
@@ -7,6 +7,11 @@ igt at fbdev@nullptr
 igt at fbdev@read
 igt at fbdev@write
 
+igt at intel_sysfs_debugfs@xe-base
+igt at intel_sysfs_debugfs@xe-debugfs-read-all-entries
+igt at intel_sysfs_debugfs@xe-forcewake
+igt at intel_sysfs_debugfs@xe-gt
+igt at intel_sysfs_debugfs@xe-sysfs-read-all-entries
 igt at kms_addfb_basic@addfb25-4-tiled
 igt at kms_addfb_basic@addfb25-bad-modifier
 igt at kms_addfb_basic@addfb25-modifier-no-flag
@@ -72,9 +77,6 @@ igt at xe_create@create-execqueues-noleak
 igt at xe_create@create-execqueues-leak
 igt at xe_create@create-invalid-mbz
 igt at xe_create@create-massive-size
-igt at xe_debugfs@base
-igt at xe_debugfs@gt
-igt at xe_debugfs@forcewake
 igt at xe_dma_buf_sync@export-dma-buf-once-write-sync
 igt at xe_dma_buf_sync@export-dma-buf-once-read-sync
 igt at xe_dma_buf_sync@export-dma-buf-once-read-write-sync
diff --git a/tests/intel-ci/xe-sriov-vf.blocklist.txt b/tests/intel-ci/xe-sriov-vf.blocklist.txt
index 0c5bc631a..3ee71bd83 100644
--- a/tests/intel-ci/xe-sriov-vf.blocklist.txt
+++ b/tests/intel-ci/xe-sriov-vf.blocklist.txt
@@ -8,4 +8,4 @@ igt at xe_module_load
 #
 # Blocked because of abort
 #
-igt at xe_debugfs@gt
+igt at intel_sysfs_debugfs@xe-gt
diff --git a/tests/intel/debugfs_test.c b/tests/intel/debugfs_test.c
deleted file mode 100644
index f2b6fb334..000000000
--- a/tests/intel/debugfs_test.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Copyright © 2017 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-#include "config.h"
-
-#include "i915/gem.h"
-#include "igt.h"
-#include "igt_hwmon.h"
-#include "igt_sysfs.h"
-#include <fcntl.h>
-#include <sys/types.h>
-#include <dirent.h>
-/**
- * TEST: debugfs test
- * Description: Read entries from debugfs, hwmon and sysfs paths.
- * Category: Core
- * Mega feature: General Core features
- * Sub-category: uapi
- * Functionality: debugfs
- * Feature: core
- * Test category: uapi
- *
- * SUBTEST: basic-hwmon
- * Description: Read all entries from hwmon path validating debugfs entries
- *
- * SUBTEST: read_all_entries
- * Description: Read all entries from debugfs path validating debugfs entries
- *
- * SUBTEST: read_all_entries_display_off
- * Description: Read all debugfs entries with display on/off.
- *
- * SUBTEST: read_all_entries_display_on
- * Description: Read all debugfs entries with display on/off.
- *
- * SUBTEST: sysfs
- * Description: Read all entries from sysfs path validating debugfs entries
- *
- */
-
-IGT_TEST_DESCRIPTION("Read entries from debugfs, hwmon and sysfs paths.");
-
-static void read_and_discard_sysfs_entries(int path_fd, int indent)
-{
-	struct dirent *dirent;
-	DIR *dir;
-	char tabs[8];
-	int i;
-
-	igt_assert(indent < sizeof(tabs) - 1);
-
-	for (i = 0; i < indent; i++)
-		tabs[i] = '\t';
-	tabs[i] = '\0';
-
-	dir = fdopendir(path_fd);
-	if (!dir)
-		return;
-
-	while ((dirent = readdir(dir))) {
-		if (!strcmp(dirent->d_name, ".") ||
-		    !strcmp(dirent->d_name, ".."))
-			continue;
-
-		if (dirent->d_type == DT_DIR) {
-			int sub_fd;
-
-			sub_fd = openat(path_fd, dirent->d_name,
-					O_RDONLY | O_DIRECTORY);
-			if (sub_fd < 0)
-				continue;
-
-			igt_debug("%sEntering subdir %s\n", tabs, dirent->d_name);
-			read_and_discard_sysfs_entries(sub_fd, indent + 1);
-			close(sub_fd);
-		} else if (dirent->d_type == DT_REG) {
-			char buf[512];
-			int sub_fd;
-			ssize_t ret;
-
-			igt_kmsg(KMSG_DEBUG "Reading file \"%s\"\n", dirent->d_name);
-			igt_debug("%sReading file \"%s\"\n", tabs, dirent->d_name);
-			igt_set_timeout(5, "reading sysfs entry");
-
-			sub_fd = openat(path_fd, dirent->d_name, O_RDONLY | O_NONBLOCK);
-			if (sub_fd == -1) {
-				igt_debug("%sCould not open file \"%s\" with error: %m\n",
-					  tabs, dirent->d_name);
-				continue;
-			}
-
-			do {
-				ret = read(sub_fd, buf, sizeof(buf));
-			} while (ret == sizeof(buf));
-
-			if (ret == -1)
-				igt_debug("%sCould not read file \"%s\" with error: %m\n",
-					  tabs, dirent->d_name);
-
-			igt_reset_timeout();
-			close(sub_fd);
-		}
-	}
-	closedir(dir);
-}
-
-static void kms_tests(int fd, int debugfs)
-{
-	igt_display_t display;
-	struct igt_fb fb[IGT_MAX_PIPES];
-	enum pipe pipe;
-	int ret;
-
-	igt_fixture
-		igt_display_require(&display, fd);
-
-	igt_subtest("read_all_entries_display_on") {
-		/* try to light all pipes */
-retry:
-		for_each_pipe(&display, pipe) {
-			igt_output_t *output;
-
-			for_each_valid_output_on_pipe(&display, pipe, output) {
-				igt_plane_t *primary;
-				drmModeModeInfo *mode;
-
-				if (output->pending_pipe != PIPE_NONE)
-					continue;
-
-				igt_output_set_pipe(output, pipe);
-				primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
-				mode = igt_output_get_mode(output);
-				igt_create_pattern_fb(display.drm_fd,
-						      mode->hdisplay, mode->vdisplay,
-						      DRM_FORMAT_XRGB8888,
-						      DRM_FORMAT_MOD_LINEAR, &fb[pipe]);
-
-				/* Set a valid fb as some debugfs like to inspect it on a active pipe */
-				igt_plane_set_fb(primary, &fb[pipe]);
-				break;
-			}
-		}
-
-		if (display.is_atomic)
-			ret = igt_display_try_commit_atomic(&display,
-					DRM_MODE_ATOMIC_TEST_ONLY |
-					DRM_MODE_ATOMIC_ALLOW_MODESET,
-					NULL);
-		else
-			ret = igt_display_try_commit2(&display, COMMIT_LEGACY);
-
-		if (ret) {
-			igt_output_t *output;
-			bool found = igt_override_all_active_output_modes_to_fit_bw(&display);
-			igt_require_f(found, "No valid mode combo found.\n");
-
-			for_each_connected_output(&display, output)
-				igt_output_set_pipe(output, PIPE_NONE);
-
-			goto retry;
-		}
-
-		igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
-
-		read_and_discard_sysfs_entries(debugfs, 0);
-	}
-
-	igt_subtest("read_all_entries_display_off") {
-		igt_output_t *output;
-		igt_plane_t *plane;
-
-		for_each_connected_output(&display, output)
-			igt_output_set_pipe(output, PIPE_NONE);
-
-		for_each_pipe(&display, pipe)
-			for_each_plane_on_pipe(&display, pipe, plane)
-				igt_plane_set_fb(plane, NULL);
-
-		igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
-
-		read_and_discard_sysfs_entries(debugfs, 0);
-	}
-
-	igt_fixture
-		igt_display_fini(&display);
-}
-
-igt_main
-{
-	int fd = -1, debugfs, sysfs, hwmon_fd;
-
-	igt_fixture {
-		fd = drm_open_driver_master(DRIVER_INTEL);
-		igt_require_gem(fd);
-		debugfs = igt_debugfs_dir(fd);
-		sysfs = igt_sysfs_open(fd);
-
-		kmstest_set_vt_graphics_mode();
-	}
-
-	igt_describe("Read all entries from sysfs path.");
-	igt_subtest("sysfs")
-		read_and_discard_sysfs_entries(sysfs, 0);
-	igt_describe("Read all entries from debugfs path.");
-	igt_subtest("read_all_entries")
-		read_and_discard_sysfs_entries(debugfs, 0);
-
-	igt_describe("Read all entries from hwmon path");
-	igt_subtest("basic-hwmon") {
-		igt_require_f(gem_has_lmem(fd), "Test applicable only for dgfx\n");
-		hwmon_fd = igt_hwmon_open(fd);
-		igt_assert(hwmon_fd >= 0);
-		read_and_discard_sysfs_entries(hwmon_fd, 0);
-		close(hwmon_fd);
-	}
-
-	igt_describe("Read all debugfs entries with display on/off.");
-	igt_subtest_group
-		kms_tests(fd, debugfs);
-
-	igt_fixture {
-		close(sysfs);
-		close(debugfs);
-		drm_close_driver(fd);
-	}
-}
diff --git a/tests/intel/i915_test_config.json b/tests/intel/i915_test_config.json
index 1a1c1aafa..04bf1fa68 100644
--- a/tests/intel/i915_test_config.json
+++ b/tests/intel/i915_test_config.json
@@ -5,7 +5,7 @@
     "files": [ "*.c", "../core_auth.c", "../core_getclient.c",
                "../core_getstats.c", "../core_getversion.c",
                "../core_hotunplug.c", "../core_setmaster.c",
-               "../core_setmaster_vs_auth.c", "../debugfs_test.c",
+               "../core_setmaster_vs_auth.c",
                "../device_reset.c", "../dmabuf.c",
                "../drm_import_export.c", "../drm_mm.c",
                "../dumb_buffer.c", "../prime_busy.c", "../prime_mmap.c",
diff --git a/tests/intel/xe_debugfs.c b/tests/intel/xe_debugfs.c
deleted file mode 100644
index ec8b0d0b5..000000000
--- a/tests/intel/xe_debugfs.c
+++ /dev/null
@@ -1,268 +0,0 @@
-// SPDX-License-Identifier: MIT
-/*
- * Copyright © 2023 Intel Corporation
- */
-
-/**
- * TEST: Check debugfs userspace API
- * Category: Core
- * Mega feature: General Core features
- * Sub-category: uapi
- * Functionality: debugfs
- * Description: Validate debugfs entries
- * Test category: functionality test
- */
-
-#include <fcntl.h>
-#include <dirent.h>
-#include <limits.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include "igt.h"
-#include "igt_sysfs.h"
-#include "xe_drm.h"
-#include "xe/xe_ioctl.h"
-#include "xe/xe_query.h"
-
-struct {
-	bool warn_on_not_hit;
-} opt = { 0 };
-
-static int validate_entries(int fd, const char *add_path, const char * const str_val[], int str_cnt)
-{
-	int i;
-	int hit;
-	int found = 0;
-	int not_found = 0;
-	DIR *dir;
-	struct dirent *de;
-	char path[PATH_MAX];
-
-	if (!igt_debugfs_path(fd, path, sizeof(path)))
-		return -1;
-
-	strcat(path, add_path);
-	dir = opendir(path);
-	if (!dir)
-		return -1;
-
-	while ((de = readdir(dir))) {
-		if (de->d_name[0] == '.')
-			continue;
-		hit = 0;
-		for (i = 0; i < str_cnt; i++) {
-			if (!strcmp(str_val[i], de->d_name)) {
-				hit = 1;
-				break;
-			}
-		}
-		if (hit) {
-			found++;
-		} else if (opt.warn_on_not_hit) {
-			not_found++;
-			igt_warn("no test for: %s/%s\n", path, de->d_name);
-		}
-	}
-	closedir(dir);
-	return 0;
-}
-
-/**
- * SUBTEST: base
- * Description: Check if various debugfs devnodes exist and test reading them.
- */
-static void
-test_base(int fd, struct drm_xe_query_config *config)
-{
-	uint16_t devid = intel_get_drm_devid(fd);
-	static const char * const expected_files[] = {
-		"gt0",
-		"gt1",
-		"stolen_mm",
-		"gtt_mm",
-		"vram0_mm",
-		"forcewake_all",
-		"info",
-		"gem_names",
-		"clients",
-		"name"
-	};
-	char reference[4096];
-	int val = 0;
-
-	igt_assert(config);
-	sprintf(reference, "devid 0x%llx",
-			config->info[DRM_XE_QUERY_CONFIG_REV_AND_DEVICE_ID] & 0xffff);
-	igt_assert(igt_debugfs_search(fd, "info", reference));
-
-	sprintf(reference, "revid %lld",
-			config->info[DRM_XE_QUERY_CONFIG_REV_AND_DEVICE_ID] >> 16);
-	igt_assert(igt_debugfs_search(fd, "info", reference));
-
-	sprintf(reference, "is_dgfx %s", config->info[DRM_XE_QUERY_CONFIG_FLAGS] &
-		DRM_XE_QUERY_CONFIG_FLAG_HAS_VRAM ? "yes" : "no");
-
-	igt_assert(igt_debugfs_search(fd, "info", reference));
-
-	if (intel_gen(devid) < 20) {
-		switch (config->info[DRM_XE_QUERY_CONFIG_VA_BITS]) {
-		case 48:
-			val = 3;
-			break;
-		case 57:
-			val = 4;
-			break;
-		}
-
-		sprintf(reference, "vm_max_level %d", val);
-		igt_assert(igt_debugfs_search(fd, "info", reference));
-	}
-
-	snprintf(reference, sizeof(reference), "tile_count %d", xe_sysfs_get_num_tiles(fd));
-	igt_assert(igt_debugfs_search(fd, "info", reference));
-
-	igt_assert(igt_debugfs_exists(fd, "gt0", O_RDONLY));
-
-	igt_assert(igt_debugfs_exists(fd, "gtt_mm", O_RDONLY));
-	igt_debugfs_dump(fd, "gtt_mm");
-
-	if (config->info[DRM_XE_QUERY_CONFIG_FLAGS] & DRM_XE_QUERY_CONFIG_FLAG_HAS_VRAM) {
-		igt_assert(igt_debugfs_exists(fd, "vram0_mm", O_RDONLY));
-		igt_debugfs_dump(fd, "vram0_mm");
-	}
-
-	if (igt_debugfs_exists(fd, "stolen_mm", O_RDONLY))
-		igt_debugfs_dump(fd, "stolen_mm");
-
-	igt_assert(igt_debugfs_exists(fd, "clients", O_RDONLY));
-	igt_debugfs_dump(fd, "clients");
-
-	igt_assert(igt_debugfs_exists(fd, "gem_names", O_RDONLY));
-	igt_debugfs_dump(fd, "gem_names");
-
-	validate_entries(fd, "", expected_files, ARRAY_SIZE(expected_files));
-}
-
-/**
- * SUBTEST: gt
- * Description: Check all gt debugfs devnodes
- * TODO: add support for ``force_reset`` entries
- */
-static void
-test_gt(int fd, int gt_id)
-{
-	char name[256];
-	static const char * const expected_files[] = {
-		"uc",
-		"steering",
-		"topology",
-		"sa_info",
-		"hw_engines",
-		"pat",
-		"mocs",
-//		"force_reset"
-		"ggtt",
-		"register-save-restore",
-		"workarounds",
-		"default_lrc_rcs",
-		"default_lrc_ccs",
-		"default_lrc_bcs",
-		"default_lrc_vcs",
-		"default_lrc_vecs",
-		"hwconfig"
-
-	};
-	static const char * const expected_files_uc[] = {
-		"huc_info",
-		"guc_log",
-		"guc_info",
-//		"guc_ct_selftest"
-	};
-
-	for (int i = 0; i < ARRAY_SIZE(expected_files); i++) {
-		sprintf(name, "gt%d/%s", gt_id, expected_files[i]);
-		igt_assert(igt_debugfs_exists(fd, name, O_RDONLY));
-		if (igt_debugfs_is_dir(fd, expected_files[i], gt_id))
-			continue;
-		igt_debugfs_dump(fd, name);
-	}
-
-	for (int i = 0; i < ARRAY_SIZE(expected_files_uc); i++) {
-		sprintf(name, "gt%d/uc/%s", gt_id, expected_files_uc[i]);
-		igt_assert(igt_debugfs_exists(fd, name, O_RDONLY));
-		igt_debugfs_dump(fd, name);
-	}
-
-	sprintf(name, "/gt%d", gt_id);
-	validate_entries(fd, name, expected_files, ARRAY_SIZE(expected_files));
-
-	sprintf(name, "/gt%d/uc", gt_id);
-	validate_entries(fd, name, expected_files_uc, ARRAY_SIZE(expected_files_uc));
-}
-
-/**
- * SUBTEST: forcewake
- * Description: check forcewake debugfs devnode
- */
-static void
-test_forcewake(int fd)
-{
-	int handle = igt_debugfs_open(fd, "forcewake_all", O_WRONLY);
-
-	igt_assert_neq(handle, -1);
-	close(handle);
-}
-
-const char *help_str =
-	"  -w\t--warn-not-hit Produce warnings if it founds a devfs node without tests";
-
-struct option long_options[] = {
-	{ "--warn-not-hit", no_argument, NULL, 'w'},
-	{ 0, 0, 0, 0 }
-};
-
-static int opt_handler(int option, int option_index, void *input)
-{
-	switch (option) {
-	case 'w':
-		opt.warn_on_not_hit = true;
-		break;
-	default:
-		return IGT_OPT_HANDLER_ERROR;
-	}
-
-	return IGT_OPT_HANDLER_SUCCESS;
-}
-
-igt_main_args("", long_options, help_str, opt_handler, NULL)
-{
-	char devnode[PATH_MAX];
-	int fd;
-	int gt;
-
-	igt_fixture {
-		fd = drm_open_driver(DRIVER_XE);
-		__igt_debugfs_dump(fd, "info", IGT_LOG_INFO);
-	}
-
-	igt_subtest("base") {
-		test_base(fd, xe_config(fd));
-	}
-
-
-	igt_subtest("gt") {
-		xe_for_each_gt(fd, gt) {
-			snprintf(devnode, sizeof(devnode), "gt%d", gt);
-			igt_require(igt_debugfs_exists(fd, devnode, O_RDONLY));
-			test_gt(fd, gt);
-		}
-	}
-
-	igt_subtest("forcewake") {
-		test_forcewake(fd);
-	}
-
-	igt_fixture
-		drm_close_driver(fd);
-}
diff --git a/tests/meson.build b/tests/meson.build
index 5eaa072fd..2c9c5736d 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -88,7 +88,6 @@ intel_i915_xe_progs = [
 
 intel_i915_progs = [
 	'api_intel_bb',
-	'debugfs_test',
 	'drm_fdinfo',
 	'gen3_mixed_blits',
 	'gen3_render_linear_blits',
@@ -281,7 +280,6 @@ intel_xe_progs = [
 	'xe_compute_preempt',
 	'xe_copy_basic',
 	'xe_dma_buf_sync',
-	'xe_debugfs',
 	'xe_drm_fdinfo',
 	'xe_eu_stall',
 	'xe_evict',
-- 
2.43.0



More information about the igt-dev mailing list