diff options
| author | Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> | 2018-07-16 15:39:05 -0700 |
|---|---|---|
| committer | Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> | 2018-07-17 11:11:12 -0700 |
| commit | 7ac224accce1f230d5d3e564c0d7e4d4869d41c5 (patch) | |
| tree | 938ddb83456e617e982ebd8ad6663a740acde1ea /tests/kms_frontbuffer_tracking.c | |
| parent | d7e1dfbff4dc43f018ee64e91a1d78524e83e20d (diff) | |
tests/frontbuffer_tracking: Use the library functions to test PSR.
kms_frontbuffer_tracking should test PSR the same way that kms_psr does.
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'tests/kms_frontbuffer_tracking.c')
| -rw-r--r-- | tests/kms_frontbuffer_tracking.c | 42 |
1 files changed, 5 insertions, 37 deletions
diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c index 116a95bc..1dfd7c1c 100644 --- a/tests/kms_frontbuffer_tracking.c +++ b/tests/kms_frontbuffer_tracking.c @@ -26,6 +26,7 @@ #include "igt.h" #include "igt_sysfs.h" +#include "igt_psr.h" #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> @@ -756,22 +757,6 @@ static bool fbc_is_enabled(int lvl) return strstr(buf, "FBC enabled\n"); } -static bool psr_is_enabled(void) -{ - char buf[256]; - - debugfs_read("i915_edp_psr_status", buf); - return strstr(buf, "\nHW Enabled & Active bit: yes\n"); -} - -static void psr_print_status(void) -{ - char buf[256]; - - debugfs_read("i915_edp_psr_status", buf); - igt_info("PSR status:\n%s\n", buf); -} - static void drrs_set(unsigned int val) { char buf[2]; @@ -949,16 +934,6 @@ static bool fbc_wait_until_enabled(void) return igt_wait(fbc_is_enabled(IGT_LOG_DEBUG), 2000, 1); } -static bool psr_wait_until_enabled(void) -{ - return igt_wait(psr_is_enabled(), 5000, 1); -} - -static bool psr_wait_until_disabled(void) -{ - return igt_wait(!psr_is_enabled(), 5000, 1); -} - static bool drrs_wait_until_rr_switch_to_low(void) { return igt_wait(is_drrs_low(), 5000, 1); @@ -1659,17 +1634,10 @@ static void do_status_assertions(int flags) igt_assert(!fbc_wait_until_enabled()); } - if (flags & ASSERT_PSR_ENABLED) { - if (!psr_wait_until_enabled()) { - psr_print_status(); - igt_assert_f(psr_is_enabled(), "PSR still disabled\n"); - } - } else if (flags & ASSERT_PSR_DISABLED) { - if (!psr_wait_until_disabled()) { - psr_print_status(); - igt_assert_f(!psr_is_enabled(), "PSR still enabled\n"); - } - } + if (flags & ASSERT_PSR_ENABLED) + igt_assert_f(psr_wait_entry(drm.fd), "PSR still disabled\n"); + else if (flags & ASSERT_PSR_DISABLED) + igt_assert_f(psr_active(drm.fd, false), "PSR still enabled\n"); } static void __do_assertions(const struct test_mode *t, int flags, |