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 /tests/kms_flip_tiling.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 'tests/kms_flip_tiling.c')
-rw-r--r-- | tests/kms_flip_tiling.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/kms_flip_tiling.c b/tests/kms_flip_tiling.c index cd2f510f..143be198 100644 --- a/tests/kms_flip_tiling.c +++ b/tests/kms_flip_tiling.c @@ -41,14 +41,14 @@ typedef struct { static igt_pipe_crc_t *_pipe_crc; -static igt_pipe_crc_t *pipe_crc_new(int pipe) +static igt_pipe_crc_t *pipe_crc_new(data_t *data, int pipe) { if (_pipe_crc) { igt_pipe_crc_free(_pipe_crc); _pipe_crc = NULL; } - _pipe_crc = igt_pipe_crc_new(pipe, INTEL_PIPE_CRC_SOURCE_AUTO); + _pipe_crc = igt_pipe_crc_new(data->drm_fd, pipe, INTEL_PIPE_CRC_SOURCE_AUTO); igt_assert(_pipe_crc); return _pipe_crc; @@ -89,7 +89,7 @@ test_flip_tiling(data_t *data, enum pipe pipe, igt_output_t *output, uint64_t ti igt_crc_t reference_crc, crc; int fb_id, ret, width; - pipe_crc = pipe_crc_new(pipe); + pipe_crc = pipe_crc_new(data, pipe); igt_output_set_pipe(output, pipe); mode = igt_output_get_mode(output); @@ -168,7 +168,7 @@ igt_main kmstest_set_vt_graphics_mode(); - igt_require_pipe_crc(); + igt_require_pipe_crc(data.drm_fd); igt_display_init(&data.display, data.drm_fd); } |