diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2017-03-02 10:37:11 +0100 |
|---|---|---|
| committer | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2017-03-21 15:50:54 +0100 |
| commit | 301ad44cdf1b868b1ab89096721da91fa8541fdc (patch) | |
| tree | ef18781db6cadae7f8f49f1fc449dc56b33448ec /lib/igt_kms.c | |
| parent | e7a0d06730f77842998368660fb45fe5c1738fda (diff) | |
lib: Open debugfs files for the given DRM device
When opening a DRM debugfs file, locate the right path based on the
given DRM device FD.
This is needed so, in setups with more than one DRM device, any
operations on debugfs files affect the expected DRM device.
v2: - rebased and fixed new API additions
v3: - updated chamelium test, which was missed previously
- use the minor of the device for the debugfs path, not the major
- have a proper exit handler for calling igt_hpd_storm_reset with the
right device fd.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Robert Foss <robert.foss@collabora.com>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'lib/igt_kms.c')
| -rw-r--r-- | lib/igt_kms.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/igt_kms.c b/lib/igt_kms.c index a986145e..d9f96725 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -747,7 +747,7 @@ void kmstest_force_edid(int drm_fd, drmModeConnector *connector, igt_assert_neq(asprintf(&path, "%s-%d/edid_override", kmstest_connector_type_str(connector->connector_type), connector->connector_type_id), -1); - debugfs_fd = igt_debugfs_open(path, O_WRONLY | O_TRUNC); + debugfs_fd = igt_debugfs_open(drm_fd, path, O_WRONLY | O_TRUNC); free(path); igt_assert(debugfs_fd != -1); @@ -1324,7 +1324,7 @@ static void parse_crtc(char *info, struct kmstest_crtc *crtc) igt_assert_eq(ret, 2); } -void kmstest_get_crtc(enum pipe pipe, struct kmstest_crtc *crtc) +void kmstest_get_crtc(int fd, enum pipe pipe, struct kmstest_crtc *crtc) { char tmp[256]; FILE *fid; @@ -1333,7 +1333,7 @@ void kmstest_get_crtc(enum pipe pipe, struct kmstest_crtc *crtc) int line; long int n; - fid = igt_debugfs_fopen("i915_display_info", mode); + fid = igt_debugfs_fopen(fd, "i915_display_info", mode); igt_skip_on(fid == NULL); @@ -1370,13 +1370,13 @@ void kmstest_get_crtc(enum pipe pipe, struct kmstest_crtc *crtc) igt_skip_on(ncrtc == 0); } -void igt_assert_plane_visible(enum pipe pipe, bool visibility) +void igt_assert_plane_visible(int fd, enum pipe pipe, bool visibility) { struct kmstest_crtc crtc; int i; bool visible; - kmstest_get_crtc(pipe, &crtc); + kmstest_get_crtc(fd, pipe, &crtc); visible = true; for (i = 0; i < crtc.n_planes; i++) { |