diff options
| -rw-r--r-- | lib/igt_kms.c | 39 | ||||
| -rw-r--r-- | tests/gem_flink_race.c | 9 | ||||
| -rw-r--r-- | tests/kms_flip.c | 11 | ||||
| -rw-r--r-- | tests/kms_sink_crc_basic.c | 4 | ||||
| -rw-r--r-- | tests/pm_rpm.c | 3 | ||||
| -rw-r--r-- | tests/prime_self_import.c | 7 |
6 files changed, 17 insertions, 56 deletions
diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 0547147f..5edd5ec5 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -42,6 +42,7 @@ #include "igt_kms.h" #include "igt_aux.h" #include "intel_chipset.h" +#include "igt_debugfs.h" /* * There hasn't been a release of libdrm containing these #define's yet, so @@ -308,30 +309,6 @@ void kmstest_set_vt_graphics_mode(void) igt_debug("VT: graphics mode set\n"); } -static int get_card_number(int fd) -{ - struct stat buf; - - /* find the minor number of the device */ - fstat(fd, &buf); - - return minor(buf.st_rdev) & 0x3f; -} - -static char* get_debugfs_connector_path(int drm_fd, drmModeConnector *connector, - const char *file) -{ - char *path; - - asprintf(&path, "/sys/kernel/debug/dri/%d/%s-%d/%s", - get_card_number(drm_fd), - kmstest_connector_type_str(connector->connector_type), - connector->connector_type_id, - file); - - return path; -} - /** * kmstest_force_connector: * @fd: drm file descriptor @@ -377,8 +354,10 @@ bool kmstest_force_connector(int drm_fd, drmModeConnector *connector, break; } - path = get_debugfs_connector_path(drm_fd, connector, "force"); - debugfs_fd = open(path, O_WRONLY | O_TRUNC); + asprintf(&path, "%s-%d/force", + kmstest_connector_type_str(connector->connector_type), + connector->connector_type_id); + debugfs_fd = igt_debugfs_open(path, O_WRONLY | O_TRUNC); if (debugfs_fd == -1) { return false; @@ -435,10 +414,10 @@ void kmstest_force_edid(int drm_fd, drmModeConnector *connector, char *path; int debugfs_fd, ret; - path = get_debugfs_connector_path(drm_fd, connector, "edid_override"); - - debugfs_fd = open(path, O_WRONLY | O_TRUNC); - + asprintf(&path, "%s-%d/edid_override", + kmstest_connector_type_str(connector->connector_type), + connector->connector_type_id); + debugfs_fd = igt_debugfs_open(path, O_WRONLY | O_TRUNC); free(path); igt_assert(debugfs_fd != -1); diff --git a/tests/gem_flink_race.c b/tests/gem_flink_race.c index eab5ef2a..a1dc85dd 100644 --- a/tests/gem_flink_race.c +++ b/tests/gem_flink_race.c @@ -52,16 +52,11 @@ int fd; static int get_object_count(void) { FILE *file; - int ret, scanned; - int device = drm_get_card(); - char *path; + int scanned, ret; igt_drop_caches_set(DROP_RETIRE); - ret = asprintf(&path, "/sys/kernel/debug/dri/%d/i915_gem_objects", device); - igt_assert(ret != -1); - - file = fopen(path, "r"); + file = igt_debugfs_fopen("i915_gem_objects", "r"); scanned = fscanf(file, "%i objects", &ret); igt_assert(scanned == 1); diff --git a/tests/kms_flip.c b/tests/kms_flip.c index 6fb291c9..612d7a9e 100644 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -679,20 +679,11 @@ static void stop_rings(bool stop) static void eat_error_state(void) { - static const char dfs_base[] = "/sys/kernel/debug/dri"; static const char dfs_entry_error[] = "i915_error_state"; static const char data[] = ""; - char fname[FILENAME_MAX]; - int card_index = drm_get_card(); int fd; - igt_assert(card_index != -1); - - /* clear the error state */ - snprintf(fname, FILENAME_MAX, "%s/%i/%s", - dfs_base, card_index, dfs_entry_error); - - fd = open(fname, O_WRONLY); + fd = igt_debugfs_open(dfs_entry_error, O_WRONLY); igt_assert(fd >= 0); igt_assert(write(fd, data, sizeof(data)) == sizeof(data)); diff --git a/tests/kms_sink_crc_basic.c b/tests/kms_sink_crc_basic.c index 5fb27d96..41accf4a 100644 --- a/tests/kms_sink_crc_basic.c +++ b/tests/kms_sink_crc_basic.c @@ -50,7 +50,9 @@ typedef struct { static void get_crc(char *crc) { int ret; - FILE *file = fopen("/sys/kernel/debug/dri/0/i915_sink_crc_eDP1", "r"); + FILE *file; + + file = igt_debugfs_fopen("i915_sink_crc_eDP1", "r"); igt_require(file); ret = fscanf(file, "%s\n", crc); diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c index d31726d1..1e65c04e 100644 --- a/tests/pm_rpm.c +++ b/tests/pm_rpm.c @@ -663,8 +663,7 @@ static void setup_pc8(void) if (!supports_pc8_plus_residencies()) return; - pc8_status_fd = open("/sys/kernel/debug/dri/0/i915_pc8_status", - O_RDONLY); + pc8_status_fd = igt_debugfs_open("i915_pc8_status", O_RDONLY); igt_assert_f(pc8_status_fd >= 0, "Can't open /sys/kernel/debug/dri/0/i915_pc8_status"); diff --git a/tests/prime_self_import.c b/tests/prime_self_import.c index 470917a5..3e482b79 100644 --- a/tests/prime_self_import.c +++ b/tests/prime_self_import.c @@ -216,15 +216,10 @@ static int get_object_count(void) { FILE *file; int ret, scanned; - int device = drm_get_card(); - char *path; igt_drop_caches_set(DROP_RETIRE); - ret = asprintf(&path, "/sys/kernel/debug/dri/%d/i915_gem_objects", device); - igt_assert(ret != -1); - - file = fopen(path, "r"); + file = igt_debugfs_fopen("i915_gem_objects", "r"); scanned = fscanf(file, "%i objects", &ret); igt_assert(scanned == 1); |