From b4ca1cc2802e674953f19a15ac06938bbf58ffe3 Mon Sep 17 00:00:00 2001 From: José Roberto de Souza Date: Thu, 20 Sep 2018 10:59:16 -0700 Subject: tests/kms_frontbuffer_tracking: Pass the debugfs fd to psr_wait_entry() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit psr_wait_entry() uses the fd to the debugfs directory not the fd the drm device. This fix some kms_frontbuffers_tracking tests: ... (kms_frontbuffer_tracking:1353) DEBUG: Calculated CRC: pipe:[94a0476d 00000000 00000000 00000000 00000000] (kms_frontbuffer_tracking:1353) DEBUG: Test requirement passed: !fbc_not_enough_stolen() (kms_frontbuffer_tracking:1353) DEBUG: Test requirement passed: !fbc_stride_not_supported() (kms_frontbuffer_tracking:1353) DEBUG: Test requirement passed: !fbc_mode_too_large() (kms_frontbuffer_tracking:1353) DEBUG: fbc_is_enabled()? FBC enabled Compressing: yes (kms_frontbuffer_tracking:1353) DEBUG: fbc_is_enabled(IGT_LOG_DEBUG) took 0ms (kms_frontbuffer_tracking:1353) DEBUG: fbc_is_compressing() took 0ms (kms_frontbuffer_tracking:1353) CRITICAL: Test assertion failure function do_status_assertions, file ../tests/kms_frontbuffer_tracking.c:1634: (kms_frontbuffer_tracking:1353) CRITICAL: Failed assertion: psr_wait_entry(drm.fd) (kms_frontbuffer_tracking:1353) CRITICAL: Last errno: 20, Not a directory (kms_frontbuffer_tracking:1353) CRITICAL: PSR still disabled (kms_frontbuffer_tracking:1353) igt_core-INFO: Stack trace: (kms_frontbuffer_tracking:1353) igt_core-INFO: #0 ../lib/igt_core.c:1467 __igt_fail_assert() (kms_frontbuffer_tracking:1353) igt_core-INFO: #1 ../tests/kms_frontbuffer_tracking.c:1635 do_status_assertions() (kms_frontbuffer_tracking:1353) igt_core-INFO: #2 ../tests/kms_frontbuffer_tracking.c:1663 __do_assertions() (kms_frontbuffer_tracking:1353) igt_core-INFO: #3 ../tests/kms_frontbuffer_tracking.c:1687 enable_prim_screen_and_wait() (kms_frontbuffer_tracking:1353) igt_core-INFO: #4 ../tests/kms_frontbuffer_tracking.c:1847 prepare_subtest_screens() (kms_frontbuffer_tracking:1353) igt_core-INFO: #5 ../tests/kms_frontbuffer_tracking.c:1867 prepare_subtest() (kms_frontbuffer_tracking:1353) igt_core-INFO: #6 ../tests/kms_frontbuffer_tracking.c:2987 tilingchange_subtest() (kms_frontbuffer_tracking:1353) igt_core-INFO: #7 ../tests/kms_frontbuffer_tracking.c:3474 main() (kms_frontbuffer_tracking:1353) igt_core-INFO: #8 ../csu/libc-start.c:344 __libc_start_main() (kms_frontbuffer_tracking:1353) igt_core-INFO: #9 [_start+0x2a] v2: Fixing code style Reviewed-by: Dhinakaran Pandiyan Signed-off-by: José Roberto de Souza --- tests/kms_frontbuffer_tracking.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/kms_frontbuffer_tracking.c') diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c index b33f3128..1bce6760 100644 --- a/tests/kms_frontbuffer_tracking.c +++ b/tests/kms_frontbuffer_tracking.c @@ -1631,7 +1631,8 @@ static void do_status_assertions(int flags) } if (flags & ASSERT_PSR_ENABLED) - igt_assert_f(psr_wait_entry(drm.fd), "PSR still disabled\n"); + igt_assert_f(psr_wait_entry(drm.debugfs), + "PSR still disabled\n"); else if (flags & ASSERT_PSR_DISABLED) igt_assert_f(psr_active(drm.debugfs, false), "PSR still enabled\n"); -- cgit v1.2.3