[igt-dev] [i-g-t v7 12/51] tests/kms_cursor_crc: Add support for Bigjoiner

Bhanuprakash Modem
2023-01-04T17:08:05Z

Reviewed-by: Mohammed Thasleem <mohammed.thasleem@intel.com>
---
tests/kms_cursor_crc.c | 43 ++++++++++++++++++++++++++++++++++++++++--
1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c
index 17f294d6..804f6876 100644
--- a/tests/kms_cursor_crc.c
+++ b/tests/kms_cursor_crc.c
@@ -700,6 +700,29 @@ static void test_rapid_movement(data_t *data)
igt_assert_lt(usec, 0.9 * 400 * 1000000 / data->refresh);
}

+static bool valid_pipe_output_combo(data_t *data)
+{
+ bool ret = false;
+ igt_display_t *display = &data->display;
+
+ igt_display_reset(display);
+
+ for_each_valid_output_on_pipe(display, data->pipe, data->output) {
+ igt_output_set_pipe(data->output, data->pipe);
+
+ if (!i915_pipe_output_combo_valid(display)) {
+ igt_output_set_pipe(data->output, PIPE_NONE);
+ continue;
+ }
+
+ ret = true;
+ break;
+ }
+ igt_output_set_pipe(data->output, PIPE_NONE);
+
+ return ret;
+}
+
static void run_size_tests(data_t *data, int w, int h)
{
enum pipe pipe;
@@ -752,6 +775,9 @@ static void run_size_tests(data_t *data, int w, int h)
for_each_pipe(&data->display, pipe) {
data->pipe = pipe;

+ if (!valid_pipe_output_combo(data))
+ continue;
+
if (require_cursor_size(data, w, h)) {
igt_info("Cursor size %dx%d not supported by driver\n", w, h);
continue;
@@ -774,8 +800,6 @@ static void run_tests_on_pipe(data_t *data)
int cursor_size;

igt_fixture {
- data->output = igt_get_single_output_for_pipe(&data->display, pipe);
- igt_require(data->output);
data->alpha = 1.0;
data->flags = 0;
}
@@ -787,6 +811,9 @@ static void run_tests_on_pipe(data_t *data)
for_each_pipe(&data->display, pipe) {
data->pipe = pipe;

+ if (!valid_pipe_output_combo(data))
+ continue;
+
igt_dynamic_f("pipe-%s-%s",
kmstest_pipe_name(pipe),
data->output->name)
@@ -801,6 +828,9 @@ static void run_tests_on_pipe(data_t *data)
for_each_pipe(&data->display, pipe) {
data->pipe = pipe;

+ if (!valid_pipe_output_combo(data))
+ continue;
+
igt_dynamic_f("pipe-%s-%s",
kmstest_pipe_name(pipe),
data->output->name)
@@ -815,6 +845,9 @@ static void run_tests_on_pipe(data_t *data)
for_each_pipe(&data->display, pipe) {
data->pipe = pipe;

+ if (!valid_pipe_output_combo(data))
+ continue;
+
igt_dynamic_f("pipe-%s-%s",
kmstest_pipe_name(pipe),
data->output->name)
@@ -833,6 +866,9 @@ static void run_tests_on_pipe(data_t *data)
data->pipe = pipe;
data->flags = TEST_DPMS;

+ if (!valid_pipe_output_combo(data))
+ continue;
+
if (require_cursor_size(data, data->cursor_max_w, data->cursor_max_h)) {
igt_debug("Cursor size %dx%d not supported by driver\n",
data->cursor_max_w, data->cursor_max_h);
@@ -854,6 +890,9 @@ static void run_tests_on_pipe(data_t *data)
data->pipe = pipe;
data->flags = TEST_SUSPEND;

+ if (!valid_pipe_output_combo(data))
+ continue;
+
if (require_cursor_size(data, data->cursor_max_w, data->cursor_max_h)) {
igt_debug("Cursor size %dx%d not supported by driver\n",
data->cursor_max_w, data->cursor_max_h);
--
2.39.0