[PATCH i-g-t 3/3] tests/intel/kms_psr2_sf: extend tests for panel replay sf
Kunal Joshi
kunal1.joshi at intel.com
Wed Feb 7 13:53:19 UTC 2024
Extend the tests to cover panel replay selective fetch feature.
>From kms_psr2_sf test point of view we have check_pr_psr2_sel_fetch_support
function to check if PR/PSR2 selective fetch is supported for an output
if output supports selective fetch then we check we enter DEEP_SLEEP mode
in run function
v2: fixed dynamic test name
v3: use check_psr2_support (Jouni)
Cc: Jouni Högander <jouni.hogander at intel.com>
Cc: Animesh Manna <animesh.manna at intel.com>
Cc: Arun R Murthy <arun.r.murthy at intel.com>
Signed-off-by: Kunal Joshi <kunal1.joshi at intel.com>
---
tests/intel/kms_psr2_sf.c | 86 +++++++++++++++++++++++++++------------
1 file changed, 61 insertions(+), 25 deletions(-)
diff --git a/tests/intel/kms_psr2_sf.c b/tests/intel/kms_psr2_sf.c
index 8e6a9e02c..1f12659e2 100644
--- a/tests/intel/kms_psr2_sf.c
+++ b/tests/intel/kms_psr2_sf.c
@@ -207,6 +207,21 @@ static const char *coexist_feature_str(int coexist_feature)
}
}
+static const char *get_psr_mode_for_output(data_t *data, igt_output_t *output)
+{
+ const char *psr_mode = NULL;
+
+ if (psr_sink_support(data->drm_fd, data->debugfs_fd, PR_MODE_SEL_FETCH,
+ output))
+ psr_mode = "pr";
+ else if (psr_sink_support(data->drm_fd, data->debugfs_fd, PSR_MODE_2,
+ output))
+ psr_mode = "psr2";
+ else
+ igt_assert_f(false, "PR/PSR2 selective fetch not supported\n");
+ return psr_mode;
+}
+
static void display_init(data_t *data)
{
igt_display_require(&data->display, data->drm_fd);
@@ -874,7 +889,7 @@ static void run(data_t *data)
{
int i;
- igt_assert(psr_wait_entry(data->debugfs_fd, PSR_MODE_2, NULL));
+ igt_assert(psr_wait_entry(data->debugfs_fd, PSR_MODE_2, data->output));
if (data->fbc_flag == true && data->op_fbc_mode == FBC_ENABLED)
igt_assert_f(intel_fbc_wait_until_enabled(data->drm_fd,
@@ -952,14 +967,20 @@ static void cleanup(data_t *data)
igt_remove_fb(data->drm_fd, &data->fb_test);
}
-static int check_psr2_support(data_t *data)
+static bool check_pr_psr2_sel_fetch_support(data_t *data)
{
- int status;
-
+ bool status = false;
+
+ if (!selective_fetch_check(data->debugfs_fd, data->output))
+ return false;
+ else if (!(psr_sink_support(data->drm_fd, data->debugfs_fd,
+ PR_MODE_SEL_FETCH, data->output) ||
+ psr_sink_support(data->drm_fd, data->debugfs_fd,
+ PSR_MODE_2_SEL_FETCH, data->output)))
+ return false;
prepare(data);
- status = psr_wait_entry(data->debugfs_fd, PSR_MODE_2, NULL);
+ status = psr_wait_entry(data->debugfs_fd, PSR_MODE_2, data->output);
cleanup(data);
-
return status;
}
@@ -981,6 +1002,8 @@ pipe_output_combo_valid(igt_display_t *display,
igt_main
{
+ bool output_supports_pr_psr2_sel_fetch = false;
+ bool pr_psr2_sel_fetch_supported = false;
data_t data = {};
igt_output_t *outputs[IGT_MAX_PIPES * IGT_MAX_PIPES];
int i, j, k, y;
@@ -1000,11 +1023,6 @@ igt_main
data.debugfs_fd = igt_debugfs_dir(data.drm_fd);
kmstest_set_vt_graphics_mode();
- igt_require_f(psr_sink_support(data.drm_fd,
- data.debugfs_fd, PSR_MODE_2,
- NULL),
- "Sink does not support PSR2\n");
-
display_init(&data);
if ((intel_display_ver(intel_get_drm_devid(data.drm_fd)) >= 20) &&
@@ -1023,7 +1041,8 @@ igt_main
for_each_pipe_with_valid_output(&data.display, data.pipe, data.output) {
coexist_features[n_pipes] = 0;
- if (check_psr2_support(&data)) {
+ output_supports_pr_psr2_sel_fetch = check_pr_psr2_sel_fetch_support(&data);
+ if (output_supports_pr_psr2_sel_fetch) {
pipes[n_pipes] = data.pipe;
outputs[n_pipes] = data.output;
@@ -1032,7 +1051,10 @@ igt_main
n_pipes++;
}
+ pr_psr2_sel_fetch_supported |= output_supports_pr_psr2_sel_fetch;
}
+ igt_require_f(pr_psr2_sel_fetch_supported,
+ "No output supports selective fetch\n");
}
for (y = 0; y < ARRAY_SIZE(fbc_status); y++) {
@@ -1053,7 +1075,8 @@ igt_main
for (j = FEATURE_NONE; j < FEATURE_COUNT; j++) {
if (j != FEATURE_NONE && !(coexist_features[i] & j))
continue;
- igt_dynamic_f("pipe-%s-%s%s", kmstest_pipe_name(pipes[i]),
+ igt_dynamic_f("%s-pipe-%s-%s%s", get_psr_mode_for_output(&data, outputs[i]),
+ kmstest_pipe_name(pipes[i]),
igt_output_name(outputs[i]),
coexist_feature_str(j)) {
data.pipe = pipes[i];
@@ -1086,7 +1109,8 @@ igt_main
for (j = FEATURE_NONE; j < FEATURE_COUNT; j++) {
if (j != FEATURE_NONE && !(coexist_features[i] & j))
continue;
- igt_dynamic_f("pipe-%s-%s%s",
+ igt_dynamic_f("%s-pipe-%s-%s%s",
+ get_psr_mode_for_output(&data, outputs[i]),
kmstest_pipe_name(pipes[i]),
igt_output_name(outputs[i]),
coexist_feature_str(j)) {
@@ -1118,7 +1142,8 @@ igt_main
for (j = FEATURE_NONE; j < FEATURE_COUNT; j++) {
if (j != FEATURE_NONE && !(coexist_features[i] & j))
continue;
- igt_dynamic_f("pipe-%s-%s%s", kmstest_pipe_name(pipes[i]),
+ igt_dynamic_f("%s-pipe-%s-%s%s", get_psr_mode_for_output(&data, outputs[i]),
+ kmstest_pipe_name(pipes[i]),
igt_output_name(outputs[i]),
coexist_feature_str(j)) {
data.pipe = pipes[i];
@@ -1148,7 +1173,8 @@ igt_main
for (j = FEATURE_NONE; j < FEATURE_COUNT; j++) {
if (j != FEATURE_NONE && !(coexist_features[i] & j))
continue;
- igt_dynamic_f("pipe-%s-%s%s", kmstest_pipe_name(pipes[i]),
+ igt_dynamic_f("%s-pipe-%s-%s%s", get_psr_mode_for_output(&data, outputs[i]),
+ kmstest_pipe_name(pipes[i]),
igt_output_name(outputs[i]),
coexist_feature_str(j)) {
data.pipe = pipes[i];
@@ -1174,7 +1200,8 @@ igt_main
for (j = FEATURE_NONE; j < FEATURE_COUNT; j++) {
if (j != FEATURE_NONE && !(coexist_features[i] & j))
continue;
- igt_dynamic_f("pipe-%s-%s%s", kmstest_pipe_name(pipes[i]),
+ igt_dynamic_f("%s-pipe-%s-%s%s", get_psr_mode_for_output(&data, outputs[i]),
+ kmstest_pipe_name(pipes[i]),
igt_output_name(outputs[i]),
coexist_feature_str(j)) {
data.pipe = pipes[i];
@@ -1201,7 +1228,8 @@ igt_main
for (j = FEATURE_NONE; j < FEATURE_COUNT; j++) {
if (j != FEATURE_NONE && !(coexist_features[i] & j))
continue;
- igt_dynamic_f("pipe-%s-%s%s", kmstest_pipe_name(pipes[i]),
+ igt_dynamic_f("%s-pipe-%s-%s%s", get_psr_mode_for_output(&data, outputs[i]),
+ kmstest_pipe_name(pipes[i]),
igt_output_name(outputs[i]),
coexist_feature_str(j)) {
data.pipe = pipes[i];
@@ -1228,7 +1256,8 @@ igt_main
for (j = FEATURE_NONE; j < FEATURE_COUNT; j++) {
if (j != FEATURE_NONE && !(coexist_features[i] & j))
continue;
- igt_dynamic_f("pipe-%s-%s%s", kmstest_pipe_name(pipes[i]),
+ igt_dynamic_f("%s-pipe-%s-%s%s", get_psr_mode_for_output(&data, outputs[i]),
+ kmstest_pipe_name(pipes[i]),
igt_output_name(outputs[i]),
coexist_feature_str(j)) {
data.pipe = pipes[i];
@@ -1256,7 +1285,9 @@ igt_main
for (j = FEATURE_NONE; j < FEATURE_COUNT; j++) {
if (j != FEATURE_NONE && !(coexist_features[i] & j))
continue;
- igt_dynamic_f("pipe-%s-%s%s", kmstest_pipe_name(pipes[i]),
+ igt_dynamic_f("%s-pipe-%s-%s%s",
+ get_psr_mode_for_output(&data, outputs[i]),
+ kmstest_pipe_name(pipes[i]),
igt_output_name(outputs[i]),
coexist_feature_str(j)) {
data.pipe = pipes[i];
@@ -1285,7 +1316,8 @@ igt_main
for (j = FEATURE_NONE; j < FEATURE_COUNT; j++) {
if (j != FEATURE_NONE && !(coexist_features[i] & j))
continue;
- igt_dynamic_f("pipe-%s-%s%s", kmstest_pipe_name(pipes[i]),
+ igt_dynamic_f("%s-pipe-%s-%s%s", get_psr_mode_for_output(&data, outputs[i]),
+ kmstest_pipe_name(pipes[i]),
igt_output_name(outputs[i]),
coexist_feature_str(j)) {
data.pipe = pipes[i];
@@ -1312,7 +1344,8 @@ igt_main
for (j = FEATURE_NONE; j < FEATURE_COUNT; j++) {
if (j != FEATURE_NONE && !(coexist_features[i] & j))
continue;
- igt_dynamic_f("pipe-%s-%s%s", kmstest_pipe_name(pipes[i]),
+ igt_dynamic_f("%s-pipe-%s-%s%s", get_psr_mode_for_output(&data, outputs[i]),
+ kmstest_pipe_name(pipes[i]),
igt_output_name(outputs[i]),
coexist_feature_str(j)) {
data.pipe = pipes[i];
@@ -1339,7 +1372,8 @@ igt_main
for (j = FEATURE_NONE; j < FEATURE_COUNT; j++) {
if (j != FEATURE_NONE && !(coexist_features[i] & j))
continue;
- igt_dynamic_f("pipe-%s-%s%s", kmstest_pipe_name(pipes[i]),
+ igt_dynamic_f("%s-pipe-%s-%s%s", get_psr_mode_for_output(&data, outputs[i]),
+ kmstest_pipe_name(pipes[i]),
igt_output_name(outputs[i]),
coexist_feature_str(j)) {
data.pipe = pipes[i];
@@ -1367,7 +1401,8 @@ igt_main
for (j = FEATURE_NONE; j < FEATURE_COUNT; j++) {
if (j != FEATURE_NONE && !(coexist_features[i] & j))
continue;
- igt_dynamic_f("pipe-%s-%s%s", kmstest_pipe_name(pipes[i]),
+ igt_dynamic_f("%s-pipe-%s-%s%s", kmstest_pipe_name(pipes[i]),
+ get_psr_mode_for_output(&data, outputs[i]),
igt_output_name(outputs[i]),
coexist_feature_str(j)) {
data.pipe = pipes[i];
@@ -1400,7 +1435,8 @@ igt_main
for (j = FEATURE_NONE; j < FEATURE_COUNT; j++) {
if (j != FEATURE_NONE && !(coexist_features[i] & j))
continue;
- igt_dynamic_f("pipe-%s-%s%s", kmstest_pipe_name(pipes[i]),
+ igt_dynamic_f("%s-pipe-%s-%s%s", get_psr_mode_for_output(&data, outputs[i]),
+ kmstest_pipe_name(pipes[i]),
igt_output_name(outputs[i]),
coexist_feature_str(j)) {
data.pipe = pipes[i];
--
2.25.1
More information about the igt-dev
mailing list