diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2017-03-21 17:57:04 +0100 |
|---|---|---|
| committer | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2017-03-21 18:01:13 +0100 |
| commit | 25fbae15262cf570e207e62f50e7c5233e06bc67 (patch) | |
| tree | 56c91c2dbf6b5a205a7ad9cc7a098c00dae82e84 /tests/chamelium.c | |
| parent | 7be509c411db2b35f6593e41222b0ad4c0e764e0 (diff) | |
Revert "lib: Open debugfs files for the given DRM device"
This reverts commit 301ad44cdf1b868b1ab89096721da91fa8541fdc.
When a render-only device is opened and gem_quiescent_gpu is called, we
need to use the debugfs dir for the master device instead.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Diffstat (limited to 'tests/chamelium.c')
| -rw-r--r-- | tests/chamelium.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/chamelium.c b/tests/chamelium.c index dc631161..810c955e 100644 --- a/tests/chamelium.c +++ b/tests/chamelium.c @@ -154,7 +154,7 @@ test_basic_hotplug(data_t *data, struct chamelium_port *port) int i; reset_state(data, port); - igt_hpd_storm_set_threshold(data->drm_fd, 0); + igt_hpd_storm_set_threshold(0); for (i = 0; i < 15; i++) { igt_flush_hotplugs(mon); @@ -175,7 +175,7 @@ test_basic_hotplug(data_t *data, struct chamelium_port *port) } igt_cleanup_hotplug(mon); - igt_hpd_storm_reset(data->drm_fd); + igt_hpd_storm_reset(); } static void @@ -536,12 +536,12 @@ test_hpd_storm_detect(data_t *data, struct chamelium_port *port, int width) struct udev_monitor *mon; int count = 0; - igt_require_hpd_storm_ctl(data->drm_fd); + igt_require_hpd_storm_ctl(); reset_state(data, port); - igt_hpd_storm_set_threshold(data->drm_fd, 1); + igt_hpd_storm_set_threshold(1); chamelium_fire_hpd_pulses(data->chamelium, port, width, 10); - igt_assert(igt_hpd_storm_detected(data->drm_fd)); + igt_assert(igt_hpd_storm_detected()); mon = igt_watch_hotplug(); chamelium_fire_hpd_pulses(data->chamelium, port, width, 10); @@ -555,21 +555,21 @@ test_hpd_storm_detect(data_t *data, struct chamelium_port *port, int width) igt_assert_lt(count, 2); igt_cleanup_hotplug(mon); - igt_hpd_storm_reset(data->drm_fd); + igt_hpd_storm_reset(); } static void test_hpd_storm_disable(data_t *data, struct chamelium_port *port, int width) { - igt_require_hpd_storm_ctl(data->drm_fd); + igt_require_hpd_storm_ctl(); reset_state(data, port); - igt_hpd_storm_set_threshold(data->drm_fd, 0); + igt_hpd_storm_set_threshold(0); chamelium_fire_hpd_pulses(data->chamelium, port, width, 10); - igt_assert(!igt_hpd_storm_detected(data->drm_fd)); + igt_assert(!igt_hpd_storm_detected()); - igt_hpd_storm_reset(data->drm_fd); + igt_hpd_storm_reset(); } #define for_each_port(p, port) \ |