diff options
| author | Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> | 2020-05-07 22:09:39 +0300 |
|---|---|---|
| committer | Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com> | 2020-05-08 15:21:50 +0300 |
| commit | 3b778b939ef804d31cd3dad2c02c1bd3fa49a668 (patch) | |
| tree | 0058ada3f660b50029402bf9b98ac7613e805fe6 /tests | |
| parent | bdb5a61d24511850953b24ed122890fdaec7ea03 (diff) | |
lib/params: start renaming functions igt_params_*
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/i915/gem_ctx_exec.c | 2 | ||||
| -rw-r--r-- | tests/i915/gem_ctx_persistence.c | 9 | ||||
| -rw-r--r-- | tests/i915/gem_mmap_gtt.c | 2 | ||||
| -rw-r--r-- | tests/i915/gem_reset_stats.c | 6 | ||||
| -rw-r--r-- | tests/i915/sysfs_heartbeat_interval.c | 3 | ||||
| -rw-r--r-- | tests/i915/sysfs_preempt_timeout.c | 3 | ||||
| -rw-r--r-- | tests/i915/sysfs_timeslice_duration.c | 3 |
7 files changed, 14 insertions, 14 deletions
diff --git a/tests/i915/gem_ctx_exec.c b/tests/i915/gem_ctx_exec.c index 23036a95..bae1d663 100644 --- a/tests/i915/gem_ctx_exec.c +++ b/tests/i915/gem_ctx_exec.c @@ -277,7 +277,7 @@ static void nohangcheck_hostile(int i915) i915 = gem_reopen_driver(i915); - dir = igt_sysfs_open_parameters(i915); + dir = igt_params_open(i915); igt_require(dir != -1); ctx = gem_context_create(i915); diff --git a/tests/i915/gem_ctx_persistence.c b/tests/i915/gem_ctx_persistence.c index a3de457a..67bce69a 100644 --- a/tests/i915/gem_ctx_persistence.c +++ b/tests/i915/gem_ctx_persistence.c @@ -98,7 +98,7 @@ static void enable_hangcheck(int i915) { int dir; - dir = igt_sysfs_open_parameters(i915); + dir = igt_params_open(i915); if (dir < 0) /* no parameters, must be default! */ return; @@ -364,7 +364,7 @@ static void test_nohangcheck_hostile(int i915) * we forcibly terminate that context. */ - dir = igt_sysfs_open_parameters(i915); + dir = igt_params_open(i915); igt_require(dir != -1); igt_require(__enable_hangcheck(dir, false)); @@ -401,7 +401,7 @@ static void test_nohangcheck_hang(int i915) igt_require(!gem_has_cmdparser(i915, ALL_ENGINES)); - dir = igt_sysfs_open_parameters(i915); + dir = igt_params_open(i915); igt_require(dir != -1); igt_require(__enable_hangcheck(dir, false)); @@ -1124,8 +1124,7 @@ igt_main igt_require_gem(i915); /* Restore the reset modparam if left clobbered */ - igt_assert(igt_sysfs_set_parameter - (i915, "reset", "%d", -1 /* any [default] reset */)); + igt_assert(igt_params_set(i915, "reset", "%d", -1)); enable_hangcheck(i915); igt_install_exit_handler(exit_handler); diff --git a/tests/i915/gem_mmap_gtt.c b/tests/i915/gem_mmap_gtt.c index d4f3f7cb..3a4681a1 100644 --- a/tests/i915/gem_mmap_gtt.c +++ b/tests/i915/gem_mmap_gtt.c @@ -656,7 +656,7 @@ test_hang(int fd) int dir; hang = igt_allow_hang(fd, 0, 0); - igt_require(igt_sysfs_set_parameter(fd, "reset", "1")); /* global */ + igt_require(igt_params_set(fd, "reset", "1")); /* global */ control = mmap(NULL, 4096, PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0); igt_assert(control != MAP_FAILED); diff --git a/tests/i915/gem_reset_stats.c b/tests/i915/gem_reset_stats.c index e2d2dd8b..b6927daf 100644 --- a/tests/i915/gem_reset_stats.c +++ b/tests/i915/gem_reset_stats.c @@ -785,8 +785,7 @@ igt_main has_reset_stats = gem_has_reset_stats(fd); - igt_assert(igt_sysfs_set_parameter - (fd, "reset", "%d", 1 /* only global reset */)); + igt_assert(igt_params_set(fd, "reset", "%d", 1 /* only global reset */)); using_full_reset = !gem_engine_reset_enabled(fd) && gem_gpu_reset_enabled(fd); @@ -847,8 +846,7 @@ igt_main int fd; fd = drm_open_driver(DRIVER_INTEL); - igt_assert(igt_sysfs_set_parameter - (fd, "reset", "%d", INT_MAX /* any reset method */)); + igt_assert(igt_params_set(fd, "reset", "%d", INT_MAX /* any reset method */)); close(fd); } } diff --git a/tests/i915/sysfs_heartbeat_interval.c b/tests/i915/sysfs_heartbeat_interval.c index 6266f3e8..6d4413d6 100644 --- a/tests/i915/sysfs_heartbeat_interval.c +++ b/tests/i915/sysfs_heartbeat_interval.c @@ -31,6 +31,7 @@ #include <sys/wait.h> #include <unistd.h> +#include "igt_params.h" #include "drmtest.h" #include "i915/gem.h" #include "i915/gem_context.h" @@ -52,7 +53,7 @@ static void enable_hangcheck(int i915, bool state) { int dir; - dir = igt_sysfs_open_parameters(i915); + dir = igt_params_open(i915); if (dir < 0) /* no parameters, must be default! */ return; diff --git a/tests/i915/sysfs_preempt_timeout.c b/tests/i915/sysfs_preempt_timeout.c index 785289cb..3f4939ee 100644 --- a/tests/i915/sysfs_preempt_timeout.c +++ b/tests/i915/sysfs_preempt_timeout.c @@ -29,6 +29,7 @@ #include <sys/types.h> #include <unistd.h> +#include "igt_params.h" #include "drmtest.h" #include "i915/gem.h" #include "i915/gem_context.h" @@ -51,7 +52,7 @@ static bool enable_hangcheck(int i915, bool state) bool success; int dir; - dir = igt_sysfs_open_parameters(i915); + dir = igt_params_open(i915); if (dir < 0) /* no parameters, must be default! */ return false; diff --git a/tests/i915/sysfs_timeslice_duration.c b/tests/i915/sysfs_timeslice_duration.c index 1eeac830..2b1e52c8 100644 --- a/tests/i915/sysfs_timeslice_duration.c +++ b/tests/i915/sysfs_timeslice_duration.c @@ -29,6 +29,7 @@ #include <sys/types.h> #include <unistd.h> +#include "igt_params.h" #include "drmtest.h" #include "i915/gem.h" #include "i915/gem_engine_topology.h" @@ -62,7 +63,7 @@ static bool enable_hangcheck(int i915, bool state) bool success; int dir; - dir = igt_sysfs_open_parameters(i915); + dir = igt_params_open(i915); if (dir < 0) /* no parameters, must be default! */ return false; |
