summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/kms_cursor_crc.c10
-rw-r--r--tests/kms_fbc_crc.c15
-rw-r--r--tests/kms_pipe_crc_basic.c4
-rw-r--r--tests/kms_plane.c23
-rw-r--r--tests/kms_psr_sink_crc.c2
-rw-r--r--tests/kms_render.c2
-rw-r--r--tests/kms_setmode.c2
-rw-r--r--tests/kms_universal_plane.c12
8 files changed, 40 insertions, 30 deletions
diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c
index 723a6d55..e7240732 100644
--- a/tests/kms_cursor_crc.c
+++ b/tests/kms_cursor_crc.c
@@ -311,14 +311,16 @@ static void run_test(data_t *data, void (*testfunc)(data_t *), int cursor_w, int
valid_tests++;
- igt_info("Beginning %s on pipe %c, connector %s\n",
- igt_subtest_name(), pipe_name(data->pipe),
+ igt_info("Beginning %s on pipe %s, connector %s\n",
+ igt_subtest_name(),
+ kmstest_pipe_name(data->pipe),
igt_output_name(output));
testfunc(data);
- igt_info("\n%s on pipe %c, connector %s: PASSED\n\n",
- igt_subtest_name(), pipe_name(data->pipe),
+ igt_info("\n%s on pipe %s, connector %s: PASSED\n\n",
+ igt_subtest_name(),
+ kmstest_pipe_name(data->pipe),
igt_output_name(output));
/* cleanup what prepare_crtc() has done */
diff --git a/tests/kms_fbc_crc.c b/tests/kms_fbc_crc.c
index b0108b1c..4302d1b4 100644
--- a/tests/kms_fbc_crc.c
+++ b/tests/kms_fbc_crc.c
@@ -458,13 +458,15 @@ static void run_test(data_t *data, enum test_mode mode)
if (!prepare_crtc(data))
continue;
- igt_info("Beginning %s on pipe %c, connector %s\n",
- igt_subtest_name(), pipe_name(data->pipe),
+ igt_info("Beginning %s on pipe %s, connector %s\n",
+ igt_subtest_name(),
+ kmstest_pipe_name(data->pipe),
igt_output_name(data->output));
if (!prepare_test(data, mode)) {
- igt_info("%s on pipe %c, connector %s: SKIPPED\n",
- igt_subtest_name(), pipe_name(data->pipe),
+ igt_info("%s on pipe %s, connector %s: SKIPPED\n",
+ igt_subtest_name(),
+ kmstest_pipe_name(data->pipe),
igt_output_name(data->output));
continue;
}
@@ -473,8 +475,9 @@ static void run_test(data_t *data, enum test_mode mode)
test_crc(data, mode);
- igt_info("%s on pipe %c, connector %s: PASSED\n",
- igt_subtest_name(), pipe_name(data->pipe),
+ igt_info("%s on pipe %s, connector %s: PASSED\n",
+ igt_subtest_name(),
+ kmstest_pipe_name(data->pipe),
igt_output_name(data->output));
finish_crtc(data, mode);
diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c
index 997c01cc..a93c20fa 100644
--- a/tests/kms_pipe_crc_basic.c
+++ b/tests/kms_pipe_crc_basic.c
@@ -212,9 +212,9 @@ static void test_read_crc(data_t *data, int pipe, unsigned flags)
for_each_connected_output(display, output) {
- igt_info("%s: Testing connector %s using pipe %c\n",
+ igt_info("%s: Testing connector %s using pipe %s\n",
igt_subtest_name(), igt_output_name(output),
- pipe_name(pipe));
+ kmstest_pipe_name(pipe));
valid_connectors += test_read_crc_for_output(data, pipe, output, flags);
}
diff --git a/tests/kms_plane.c b/tests/kms_plane.c
index 93a05bb9..2e552fdc 100644
--- a/tests/kms_plane.c
+++ b/tests/kms_plane.c
@@ -159,8 +159,8 @@ test_plane_position_with_output(data_t *data,
drmModeModeInfo *mode;
igt_crc_t crc;
- igt_info("Testing connector %s using pipe %c plane %d\n",
- igt_output_name(output), pipe_name(pipe), plane);
+ igt_info("Testing connector %s using pipe %s plane %d\n",
+ igt_output_name(output), kmstest_pipe_name(pipe), plane);
test_init(data, pipe);
@@ -284,7 +284,8 @@ test_plane_panning_with_output(data_t *data,
drmModeModeInfo *mode;
igt_crc_t crc;
- igt_info("Testing connector %s using pipe %c plane %d\n", igt_output_name(output), pipe_name(pipe), plane);
+ igt_info("Testing connector %s using pipe %s plane %d\n",
+ igt_output_name(output), kmstest_pipe_name(pipe), plane);
test_init(data, pipe);
@@ -341,21 +342,21 @@ test_plane_panning(data_t *data, enum pipe pipe, enum igt_plane plane,
static void
run_tests_for_pipe_plane(data_t *data, enum pipe pipe, enum igt_plane plane)
{
- igt_subtest_f("plane-position-covered-pipe-%c-plane-%d",
- pipe_name(pipe), plane)
+ igt_subtest_f("plane-position-covered-pipe-%s-plane-%d",
+ kmstest_pipe_name(pipe), plane)
test_plane_position(data, pipe, plane,
TEST_POSITION_FULLY_COVERED);
- igt_subtest_f("plane-position-hole-pipe-%c-plane-%d",
- pipe_name(pipe), plane)
+ igt_subtest_f("plane-position-hole-pipe-%s-plane-%d",
+ kmstest_pipe_name(pipe), plane)
test_plane_position(data, pipe, plane, 0);
- igt_subtest_f("plane-panning-top-left-pipe-%c-plane-%d",
- pipe_name(pipe), plane)
+ igt_subtest_f("plane-panning-top-left-pipe-%s-plane-%d",
+ kmstest_pipe_name(pipe), plane)
test_plane_panning(data, pipe, plane, TEST_PANNING_TOP_LEFT);
- igt_subtest_f("plane-panning-bottom-right-pipe-%c-plane-%d",
- pipe_name(pipe), plane)
+ igt_subtest_f("plane-panning-bottom-right-pipe-%s-plane-%d",
+ kmstest_pipe_name(pipe), plane)
test_plane_panning(data, pipe, plane,
TEST_PANNING_BOTTOM_RIGHT);
diff --git a/tests/kms_psr_sink_crc.c b/tests/kms_psr_sink_crc.c
index c26c7967..9cae9a6a 100644
--- a/tests/kms_psr_sink_crc.c
+++ b/tests/kms_psr_sink_crc.c
@@ -140,7 +140,7 @@ connector_set_mode(data_t *data, drmModeModeInfo *mode, uint32_t fb_id)
int ret;
#if 0
- fprintf(stdout, "Using pipe %c, %dx%d\n", pipe_name(config->pipe),
+ fprintf(stdout, "Using pipe %s, %dx%d\n", kmstest_pipe_name(config->pipe),
mode->hdisplay, mode->vdisplay);
#endif
diff --git a/tests/kms_render.c b/tests/kms_render.c
index 6c742e23..84cda80a 100644
--- a/tests/kms_render.c
+++ b/tests/kms_render.c
@@ -114,7 +114,7 @@ static int test_format(const char *test_name,
mode->name, mode->vrefresh, igt_format_str(format));
igt_assert(ret > 0);
ret = asprintf(&cconf_str, "pipe %s, encoder %s, connector %s",
- kmstest_pipe_str(cconf->pipe),
+ kmstest_pipe_name(cconf->pipe),
kmstest_encoder_type_str(cconf->encoder->encoder_type),
kmstest_connector_type_str(cconf->connector->connector_type));
igt_assert(ret > 0);
diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c
index 87622552..46edf54b 100644
--- a/tests/kms_setmode.c
+++ b/tests/kms_setmode.c
@@ -246,7 +246,7 @@ static void get_crtc_config_str(struct crtc_config *crtc, char *buf,
pos = snprintf(buf, buf_size,
"CRTC[%d] [Pipe %s] Mode: %s@%dHz Connectors: ",
- crtc->crtc_id, kmstest_pipe_str(crtc->pipe_id),
+ crtc->crtc_id, kmstest_pipe_name(crtc->pipe_id),
crtc->mode.name, crtc->mode.vrefresh);
if (pos > buf_size)
return;
diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
index 94d89b87..805cc596 100644
--- a/tests/kms_universal_plane.c
+++ b/tests/kms_universal_plane.c
@@ -135,7 +135,8 @@ functional_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
igt_assert(data->display.has_universal_planes);
igt_skip_on(pipe >= display->n_pipes);
- igt_info("Testing connector %s using pipe %c\n", igt_output_name(output), pipe_name(pipe));
+ igt_info("Testing connector %s using pipe %s\n", igt_output_name(output),
+ kmstest_pipe_name(pipe));
functional_test_init(&test, output, pipe);
@@ -534,15 +535,18 @@ run_tests_for_pipe(data_t *data, enum pipe pipe)
{
igt_output_t *output;
- igt_subtest_f("universal-plane-pipe-%c-functional", pipe_name(pipe))
+ igt_subtest_f("universal-plane-pipe-%s-functional",
+ kmstest_pipe_name(pipe))
for_each_connected_output(&data->display, output)
functional_test_pipe(data, pipe, output);
- igt_subtest_f("universal-plane-pipe-%c-sanity", pipe_name(pipe))
+ igt_subtest_f("universal-plane-pipe-%s-sanity",
+ kmstest_pipe_name(pipe))
for_each_connected_output(&data->display, output)
sanity_test_pipe(data, pipe, output);
- igt_subtest_f("disable-primary-vs-flip-pipe-%c", pipe_name(pipe))
+ igt_subtest_f("disable-primary-vs-flip-pipe-%s",
+ kmstest_pipe_name(pipe))
for_each_connected_output(&data->display, output)
pageflip_test_pipe(data, pipe, output);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-03 05:40:41 +0000