diff options
| author | Michał Winiarski <michal.winiarski@intel.com> | 2019-03-13 16:24:03 +0100 |
|---|---|---|
| committer | Michał Winiarski <michal.winiarski@intel.com> | 2019-03-20 10:36:36 +0100 |
| commit | baec59ef68a853cda115e3064a8e9c969eba6a8e (patch) | |
| tree | 769a815a5168886d33d82d66f309c70058d8d40b /tests/i915 | |
| parent | eab79da0462eef1ef365c540bb269e35af359a8f (diff) | |
tests/i915_pm_rps: Use sysfs helpers
Doing this lets us avoid drm_get_card, which we plan to remove
eventually.
v2: We were extermally unlikely to find rps knobs in current dir.
Signed-off-by: Michał Winiarski <michal.winiarski@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tests/i915')
| -rw-r--r-- | tests/i915/i915_pm_rps.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/i915/i915_pm_rps.c b/tests/i915/i915_pm_rps.c index d20cd2d8..ed146045 100644 --- a/tests/i915/i915_pm_rps.c +++ b/tests/i915/i915_pm_rps.c @@ -38,12 +38,12 @@ #include "igt.h" #include "igt_dummyload.h" +#include "igt_sysfs.h" IGT_TEST_DESCRIPTION("Render P-States tests - verify GPU frequency changes"); static int drm_fd; -static const char sysfs_base_path[] = "/sys/class/drm/card%d/gt_%s_freq_mhz"; enum { CUR, MIN, @@ -629,20 +629,23 @@ igt_main igt_skip_on_simulation(); igt_fixture { - const int device = drm_get_card(); struct sysfs_file *sysfs_file = sysfs_files; + char sysfs_path[80]; int ret; /* Use drm_open_driver to verify device existence */ drm_fd = drm_open_driver(DRIVER_INTEL); igt_require_gem(drm_fd); igt_require(gem_can_store_dword(drm_fd, 0)); + igt_assert(igt_sysfs_path(drm_fd, sysfs_path, + sizeof(sysfs_path), NULL)); do { int val = -1; char *path; - ret = asprintf(&path, sysfs_base_path, device, sysfs_file->name); + ret = asprintf(&path, "%s/gt_%s_freq_mhz", + sysfs_path, sysfs_file->name); igt_assert(ret != -1); sysfs_file->filp = fopen(path, sysfs_file->mode); igt_require(sysfs_file->filp); |