lib/psr: Make psr_wait_entry and psr_wait_update aware of the PSR version tested

This way we can test both PSR version separated.

v4: Dropping psr_state_check() to psr_active_check()

Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Dhinakaran Pandiyan's avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: José Roberto de Souza's avatarJosé Roberto de Souza <jose.souza@intel.com>
parent 21a5e27a
......@@ -25,26 +25,33 @@
#include "igt_sysfs.h"
#include <errno.h>
static bool psr_active(int debugfs_fd, bool check_active)
static bool psr_active_check(int debugfs_fd, enum psr_mode mode)
{
bool active;
char buf[PSR_STATUS_MAX_LEN];
const char *state = mode == PSR_MODE_1 ? "SRDENT" : "DEEP_SLEEP";
igt_debugfs_simple_read(debugfs_fd, "i915_edp_psr_status", buf,
sizeof(buf));
active = strstr(buf, "SRDENT") || strstr(buf, "DEEP_SLEEP");
return check_active ? active : !active;
return strstr(buf, state);
}
bool psr_wait_entry(int debugfs_fd)
static inline const char *psr_active_state_get(enum psr_mode mode)
{
return igt_wait(psr_active(debugfs_fd, true), 500, 20);
return mode == PSR_MODE_1 ? "SRDENT" : "DEEP_SLEEP";
}
bool psr_wait_update(int debugfs_fd)
/*
* For PSR1, we wait until PSR is active. We wait until DEEP_SLEEP for PSR2.
*/
bool psr_wait_entry(int debugfs_fd, enum psr_mode mode)
{
return igt_wait(psr_active_check(debugfs_fd, mode), 500, 20);
}
bool psr_wait_update(int debugfs_fd, enum psr_mode mode)
{
return igt_wait(psr_active(debugfs_fd, false), 40, 10);
return igt_wait(!psr_active_check(debugfs_fd, mode), 40, 10);
}
static ssize_t psr_write(int debugfs_fd, const char *buf)
......
......@@ -30,8 +30,13 @@
#define PSR_STATUS_MAX_LEN 512
bool psr_wait_entry(int debugfs_fd);
bool psr_wait_update(int debugfs_fd);
enum psr_mode {
PSR_MODE_1,
PSR_MODE_2
};
bool psr_wait_entry(int debugfs_fd, enum psr_mode mode);
bool psr_wait_update(int debugfs_fd, enum psr_mode mode);
bool psr_enable(int debugfs_fd);
bool psr_disable(int debugfs_fd);
bool psr_sink_support(int debugfs_fd);
......
......@@ -1622,10 +1622,10 @@ static void do_status_assertions(int flags)
}
if (flags & ASSERT_PSR_ENABLED)
igt_assert_f(psr_wait_entry(drm.debugfs),
igt_assert_f(psr_wait_entry(drm.debugfs, PSR_MODE_1),
"PSR still disabled\n");
else if (flags & ASSERT_PSR_DISABLED)
igt_assert_f(psr_wait_update(drm.debugfs),
igt_assert_f(psr_wait_update(drm.debugfs, PSR_MODE_1),
"PSR still enabled\n");
}
......
......@@ -199,7 +199,7 @@ static bool psr_wait_entry_if_enabled(data_t *data)
if (data->with_psr_disabled)
return true;
return psr_wait_entry(data->debugfs_fd);
return psr_wait_entry(data->debugfs_fd, PSR_MODE_1);
}
static inline void manual(const char *expected)
......@@ -289,7 +289,7 @@ static void run_test(data_t *data)
expected = "screen GREEN";
break;
}
igt_assert(psr_wait_update(data->debugfs_fd));
igt_assert(psr_wait_update(data->debugfs_fd, PSR_MODE_1));
manual(expected);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment