* [igt-dev] [i-g-t] tests: s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/
@ 2023-05-04 11:51 Bhanuprakash Modem
2023-05-04 14:38 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Bhanuprakash Modem @ 2023-05-04 11:51 UTC (permalink / raw)
To: igt-dev
As i915_pipe_output_combo_valid() is no more i915 specific, and
it supports both i915 & XE then rename the helper.
s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
lib/igt_kms.c | 4 ++--
lib/igt_kms.h | 2 +-
tests/i915/kms_big_fb.c | 2 +-
tests/i915/kms_busy.c | 2 +-
tests/i915/kms_ccs.c | 2 +-
tests/i915/kms_cdclk.c | 4 ++--
tests/i915/kms_draw_crc.c | 2 +-
tests/i915/kms_dsc.c | 2 +-
tests/i915/kms_fence_pin_leak.c | 2 +-
tests/i915/kms_flip_scaled_crc.c | 4 ++--
tests/i915/kms_flip_tiling.c | 2 +-
tests/i915/kms_frontbuffer_tracking.c | 2 +-
tests/i915/kms_mmap_write_crc.c | 2 +-
tests/i915/kms_psr.c | 2 +-
tests/i915/kms_psr2_sf.c | 2 +-
tests/i915/kms_psr2_su.c | 2 +-
tests/i915/kms_psr_stress_test.c | 2 +-
tests/i915/kms_pwrite_crc.c | 2 +-
tests/kms_async_flips.c | 2 +-
tests/kms_atomic.c | 2 +-
tests/kms_atomic_interruptible.c | 2 +-
tests/kms_atomic_transition.c | 6 +++---
tests/kms_color_helper.c | 2 +-
tests/kms_concurrent.c | 2 +-
tests/kms_content_protection.c | 2 +-
tests/kms_cursor_crc.c | 2 +-
tests/kms_cursor_edge_walk.c | 2 +-
tests/kms_cursor_legacy.c | 2 +-
tests/kms_display_modes.c | 2 +-
tests/kms_dp_tiled_display.c | 2 +-
tests/kms_flip_event_leak.c | 2 +-
tests/kms_invalid_mode.c | 2 +-
tests/kms_lease.c | 2 +-
tests/kms_pipe_crc_basic.c | 2 +-
tests/kms_plane.c | 2 +-
tests/kms_plane_alpha_blend.c | 2 +-
tests/kms_plane_cursor.c | 2 +-
tests/kms_plane_lowres.c | 2 +-
tests/kms_plane_multiple.c | 2 +-
tests/kms_plane_scaling.c | 4 ++--
tests/kms_prime.c | 2 +-
tests/kms_properties.c | 6 +++---
tests/kms_rmfb.c | 2 +-
tests/kms_rotation_crc.c | 6 +++---
tests/kms_scaling_modes.c | 2 +-
tests/kms_sequence.c | 2 +-
tests/kms_universal_plane.c | 2 +-
tests/kms_vblank.c | 6 +++---
tests/kms_vrr.c | 2 +-
49 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index e085e234a..57cc7b39b 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -5975,7 +5975,7 @@ bool igt_parse_mode_string(const char *mode_string, drmModeModeInfo *mode)
}
/*
- * i915_pipe_output_combo_valid:
+ * intel_pipe_output_combo_valid:
* @display: a pointer to an #igt_display_t structure
*
* Every individual test must use igt_output_set_pipe() before calling this
@@ -5993,7 +5993,7 @@ bool igt_parse_mode_string(const char *mode_string, drmModeModeInfo *mode)
*
* Returns: true if a valid pipe/output mode combo found, else false
*/
-bool i915_pipe_output_combo_valid(igt_display_t *display)
+bool intel_pipe_output_combo_valid(igt_display_t *display)
{
int combo = 0;
igt_output_t *output;
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index 483b41651..bb6e62946 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -996,6 +996,6 @@ int igt_get_max_dotclock(int fd);
bool igt_bigjoiner_possible(drmModeModeInfo *mode, int max_dotclock);
bool igt_check_bigjoiner_support(igt_display_t *display);
bool igt_parse_mode_string(const char *mode_string, drmModeModeInfo *mode);
-bool i915_pipe_output_combo_valid(igt_display_t *display);
+bool intel_pipe_output_combo_valid(igt_display_t *display);
#endif /* __IGT_KMS_H__ */
diff --git a/tests/i915/kms_big_fb.c b/tests/i915/kms_big_fb.c
index a0d5ef730..2ba88f2c3 100644
--- a/tests/i915/kms_big_fb.c
+++ b/tests/i915/kms_big_fb.c
@@ -608,7 +608,7 @@ static void test_scanout(data_t *data)
igt_display_reset(&data->display);
igt_output_set_pipe(data->output, data->pipe);
- if (!i915_pipe_output_combo_valid(&data->display))
+ if (!intel_pipe_output_combo_valid(&data->display))
continue;
if (data->async_flip_test) {
diff --git a/tests/i915/kms_busy.c b/tests/i915/kms_busy.c
index 20d3058fb..c7b74f0fb 100644
--- a/tests/i915/kms_busy.c
+++ b/tests/i915/kms_busy.c
@@ -319,7 +319,7 @@ pipe_output_combo_valid(igt_display_t *dpy,
igt_display_reset(dpy);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(dpy))
+ if (!intel_pipe_output_combo_valid(dpy))
ret = false;
igt_output_set_pipe(output, PIPE_NONE);
diff --git a/tests/i915/kms_ccs.c b/tests/i915/kms_ccs.c
index 1b3462ea9..9e5968c09 100644
--- a/tests/i915/kms_ccs.c
+++ b/tests/i915/kms_ccs.c
@@ -596,7 +596,7 @@ static void test_output(data_t *data, const int testnum)
igt_display_reset(&data->display);
igt_output_set_pipe(data->output, data->pipe);
- if (i915_pipe_output_combo_valid(&data->display)) {
+ if (intel_pipe_output_combo_valid(&data->display)) {
found = true;
break;
}
diff --git a/tests/i915/kms_cdclk.c b/tests/i915/kms_cdclk.c
index 0f9b8dc58..9e8044062 100644
--- a/tests/i915/kms_cdclk.c
+++ b/tests/i915/kms_cdclk.c
@@ -283,7 +283,7 @@ static void test_mode_transition_on_all_outputs(data_t *data)
igt_output_override_mode(output, mode_hi);
i++;
}
- igt_require(i915_pipe_output_combo_valid(display));
+ igt_require(intel_pipe_output_combo_valid(display));
igt_display_reset(display);
igt_create_pattern_fb(data->drm_fd, width, height, DRM_FORMAT_XRGB8888,
@@ -352,7 +352,7 @@ static void run_cdclk_test(data_t *data, uint32_t flags)
for_each_pipe_with_valid_output(display, pipe, output) {
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display)) {
+ if (!intel_pipe_output_combo_valid(display)) {
igt_output_set_pipe(output, PIPE_NONE);
continue;
}
diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c
index db6d71f2e..3f78bac8b 100644
--- a/tests/i915/kms_draw_crc.c
+++ b/tests/i915/kms_draw_crc.c
@@ -63,7 +63,7 @@ static void find_modeset_params(void)
igt_display_reset(&display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(&display))
+ if (!intel_pipe_output_combo_valid(&display))
continue;
mode = igt_output_get_mode(output);
diff --git a/tests/i915/kms_dsc.c b/tests/i915/kms_dsc.c
index c4dfc9251..98dc56479 100644
--- a/tests/i915/kms_dsc.c
+++ b/tests/i915/kms_dsc.c
@@ -83,7 +83,7 @@ static bool pipe_output_combo_valid(data_t *data)
igt_output_set_pipe(output, data->pipe);
igt_output_override_mode(output, mode);
- if (!i915_pipe_output_combo_valid(&data->display))
+ if (!intel_pipe_output_combo_valid(&data->display))
ret = false;
igt_output_set_pipe(output, PIPE_NONE);
diff --git a/tests/i915/kms_fence_pin_leak.c b/tests/i915/kms_fence_pin_leak.c
index 63657a742..6b678668e 100644
--- a/tests/i915/kms_fence_pin_leak.c
+++ b/tests/i915/kms_fence_pin_leak.c
@@ -202,7 +202,7 @@ static void run_test(data_t *data)
igt_display_reset(display);
igt_output_set_pipe(output, p);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
run_single_test(data, p, output);
diff --git a/tests/i915/kms_flip_scaled_crc.c b/tests/i915/kms_flip_scaled_crc.c
index f5dc430e3..987f5f54a 100644
--- a/tests/i915/kms_flip_scaled_crc.c
+++ b/tests/i915/kms_flip_scaled_crc.c
@@ -660,7 +660,7 @@ igt_main
igt_output_set_pipe(output, pipe);
igt_output_override_mode(output, modetoset);
- if (modetoset && i915_pipe_output_combo_valid(&data.display)) {
+ if (modetoset && intel_pipe_output_combo_valid(&data.display)) {
found = true;
igt_dynamic_f("pipe-%s-valid-mode", kmstest_pipe_name(pipe))
run_tests(&data, index, pipe, output, modetoset);
@@ -672,7 +672,7 @@ igt_main
igt_display_reset(&data.display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(&data.display))
+ if (!intel_pipe_output_combo_valid(&data.display))
continue;
modetoset = NULL;
diff --git a/tests/i915/kms_flip_tiling.c b/tests/i915/kms_flip_tiling.c
index a22f12382..01c27efef 100644
--- a/tests/i915/kms_flip_tiling.c
+++ b/tests/i915/kms_flip_tiling.c
@@ -199,7 +199,7 @@ igt_main
pipe_crc_free(&data);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(&data.display))
+ if (!intel_pipe_output_combo_valid(&data.display))
continue;
plane = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
diff --git a/tests/i915/kms_frontbuffer_tracking.c b/tests/i915/kms_frontbuffer_tracking.c
index 650e14a77..c7af27be4 100644
--- a/tests/i915/kms_frontbuffer_tracking.c
+++ b/tests/i915/kms_frontbuffer_tracking.c
@@ -415,7 +415,7 @@ static bool find_connector(bool edp_only, bool pipe_a,
igt_output_set_pipe(output, pipe);
igt_output_override_mode(output, connector_get_mode(output));
- if (i915_pipe_output_combo_valid(&drm.display)) {
+ if (intel_pipe_output_combo_valid(&drm.display)) {
*ret_output = output;
*ret_pipe = pipe;
return true;
diff --git a/tests/i915/kms_mmap_write_crc.c b/tests/i915/kms_mmap_write_crc.c
index bc51975f6..5f7750041 100644
--- a/tests/i915/kms_mmap_write_crc.c
+++ b/tests/i915/kms_mmap_write_crc.c
@@ -280,7 +280,7 @@ igt_main_args("n", NULL, NULL, opt_handler, NULL)
igt_display_reset(&data.display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(&data.display))
+ if (!intel_pipe_output_combo_valid(&data.display))
continue;
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe),
diff --git a/tests/i915/kms_psr.c b/tests/i915/kms_psr.c
index 0e8d7f4f0..4f8a49b36 100644
--- a/tests/i915/kms_psr.c
+++ b/tests/i915/kms_psr.c
@@ -105,7 +105,7 @@ static void setup_output(data_t *data)
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
data->crtc_id = output->config.crtc->crtc_id;
diff --git a/tests/i915/kms_psr2_sf.c b/tests/i915/kms_psr2_sf.c
index 4cf986440..d55b818ef 100644
--- a/tests/i915/kms_psr2_sf.c
+++ b/tests/i915/kms_psr2_sf.c
@@ -879,7 +879,7 @@ pipe_output_combo_valid(igt_display_t *display,
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
ret = false;
igt_output_set_pipe(output, PIPE_NONE);
diff --git a/tests/i915/kms_psr2_su.c b/tests/i915/kms_psr2_su.c
index 65e67b8c9..43fed4241 100644
--- a/tests/i915/kms_psr2_su.c
+++ b/tests/i915/kms_psr2_su.c
@@ -106,7 +106,7 @@ static void setup_output(data_t *data)
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
data->output = output;
diff --git a/tests/i915/kms_psr_stress_test.c b/tests/i915/kms_psr_stress_test.c
index a4cb3194e..0812bcdd1 100644
--- a/tests/i915/kms_psr_stress_test.c
+++ b/tests/i915/kms_psr_stress_test.c
@@ -74,7 +74,7 @@ static void setup_output(data_t *data)
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display)) {
+ if (!intel_pipe_output_combo_valid(display)) {
igt_output_set_pipe(output, PIPE_NONE);
continue;
}
diff --git a/tests/i915/kms_pwrite_crc.c b/tests/i915/kms_pwrite_crc.c
index 3278d876d..e8481b545 100644
--- a/tests/i915/kms_pwrite_crc.c
+++ b/tests/i915/kms_pwrite_crc.c
@@ -162,7 +162,7 @@ static void run_test(data_t *data)
igt_display_reset(display);
igt_output_set_pipe(data->output, data->pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
prepare_crtc(data);
diff --git a/tests/kms_async_flips.c b/tests/kms_async_flips.c
index 51ffa523a..1b13b04dd 100644
--- a/tests/kms_async_flips.c
+++ b/tests/kms_async_flips.c
@@ -554,7 +554,7 @@ static void run_test(data_t *data, void (*test)(data_t *))
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), output->name) {
diff --git a/tests/kms_atomic.c b/tests/kms_atomic.c
index 037db2d36..c2232bacb 100644
--- a/tests/kms_atomic.c
+++ b/tests/kms_atomic.c
@@ -1312,7 +1312,7 @@ igt_main
igt_display_reset(&display);
igt_output_set_pipe(output, pipe);
- if (i915_pipe_output_combo_valid(&display)) {
+ if (intel_pipe_output_combo_valid(&display)) {
valid_config = true;
break;
}
diff --git a/tests/kms_atomic_interruptible.c b/tests/kms_atomic_interruptible.c
index 74b2e246a..a21830f26 100644
--- a/tests/kms_atomic_interruptible.c
+++ b/tests/kms_atomic_interruptible.c
@@ -277,7 +277,7 @@ static bool pipe_output_combo_valid(igt_display_t *display,
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
ret = false;
igt_output_set_pipe(output, PIPE_NONE);
diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c
index 9f39d033d..cd6df6cf2 100644
--- a/tests/kms_atomic_transition.c
+++ b/tests/kms_atomic_transition.c
@@ -767,7 +767,7 @@ static unsigned set_combinations(data_t *data, unsigned mask, struct igt_fb *fb)
continue;
igt_output_set_pipe(output, pipe);
- if (i915_pipe_output_combo_valid(&data->display)) {
+ if (intel_pipe_output_combo_valid(&data->display)) {
mode = igt_output_get_mode(output);
break;
} else {
@@ -857,7 +857,7 @@ retry:
continue;
igt_output_set_pipe(output, i);
- if (i915_pipe_output_combo_valid(&data->display)) {
+ if (intel_pipe_output_combo_valid(&data->display)) {
mode = igt_output_get_mode(output);
igt_info("(pipe %s + %s), mode:",
@@ -1013,7 +1013,7 @@ static bool pipe_output_combo_valid(igt_display_t *display,
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
ret = false;
igt_output_set_pipe(output, PIPE_NONE);
diff --git a/tests/kms_color_helper.c b/tests/kms_color_helper.c
index b01c38ef6..c756b280e 100644
--- a/tests/kms_color_helper.c
+++ b/tests/kms_color_helper.c
@@ -29,7 +29,7 @@ bool pipe_output_combo_valid(data_t *data, enum pipe pipe)
bool ret = true;
igt_output_set_pipe(data->output, pipe);
- if (!i915_pipe_output_combo_valid(&data->display))
+ if (!intel_pipe_output_combo_valid(&data->display))
ret = false;
igt_output_set_pipe(data->output, PIPE_NONE);
diff --git a/tests/kms_concurrent.c b/tests/kms_concurrent.c
index e1e581723..1ba2d11be 100644
--- a/tests/kms_concurrent.c
+++ b/tests/kms_concurrent.c
@@ -334,7 +334,7 @@ run_tests_for_pipe(data_t *data, enum pipe pipe)
igt_display_reset(&data->display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(&data->display))
+ if (!intel_pipe_output_combo_valid(&data->display))
continue;
igt_output_set_pipe(output, PIPE_NONE);
diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
index 344cac505..0b12d9c2f 100644
--- a/tests/kms_content_protection.c
+++ b/tests/kms_content_protection.c
@@ -509,7 +509,7 @@ test_content_protection(enum igt_commit_style s, int content_type)
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
modeset_with_fb(pipe, output, s);
diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c
index 3a353a032..8e7f32aee 100644
--- a/tests/kms_cursor_crc.c
+++ b/tests/kms_cursor_crc.c
@@ -713,7 +713,7 @@ static bool valid_pipe_output_combo(data_t *data)
igt_display_reset(display);
igt_output_set_pipe(data->output, data->pipe);
- if (i915_pipe_output_combo_valid(display))
+ if (intel_pipe_output_combo_valid(display))
ret = true;
igt_output_set_pipe(data->output, PIPE_NONE);
diff --git a/tests/kms_cursor_edge_walk.c b/tests/kms_cursor_edge_walk.c
index 5f423a18f..e4323b18d 100644
--- a/tests/kms_cursor_edge_walk.c
+++ b/tests/kms_cursor_edge_walk.c
@@ -375,7 +375,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
igt_display_reset(&data.display);
igt_output_set_pipe(data.output, data.pipe);
- if (!i915_pipe_output_combo_valid(&data.display))
+ if (!intel_pipe_output_combo_valid(&data.display))
continue;
igt_output_set_pipe(data.output, PIPE_NONE);
diff --git a/tests/kms_cursor_legacy.c b/tests/kms_cursor_legacy.c
index 7df6a6125..7e689c485 100644
--- a/tests/kms_cursor_legacy.c
+++ b/tests/kms_cursor_legacy.c
@@ -247,7 +247,7 @@ find_connected_pipe(igt_display_t *display, bool second, igt_output_t **output)
continue;
igt_output_set_pipe(*output, pipe);
- if (i915_pipe_output_combo_valid(display)) {
+ if (intel_pipe_output_combo_valid(display)) {
found = true;
if (second) {
diff --git a/tests/kms_display_modes.c b/tests/kms_display_modes.c
index d69c7b931..9fbea228b 100644
--- a/tests/kms_display_modes.c
+++ b/tests/kms_display_modes.c
@@ -156,7 +156,7 @@ static void run_extendedmode_test(data_t *data) {
igt_output_set_pipe(output1, pipe1);
igt_output_set_pipe(output2, pipe2);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
igt_dynamic_f("pipe-%s-%s-pipe-%s-%s",
diff --git a/tests/kms_dp_tiled_display.c b/tests/kms_dp_tiled_display.c
index 07b803a50..77d5352ac 100644
--- a/tests/kms_dp_tiled_display.c
+++ b/tests/kms_dp_tiled_display.c
@@ -272,7 +272,7 @@ static void setup_mode(data_t *data)
igt_require(found);
igt_output_override_mode(output, mode);
}
- igt_require(i915_pipe_output_combo_valid(data->display));
+ igt_require(intel_pipe_output_combo_valid(data->display));
igt_display_commit_atomic(data->display, DRM_MODE_ATOMIC_ALLOW_MODESET,
NULL);
}
diff --git a/tests/kms_flip_event_leak.c b/tests/kms_flip_event_leak.c
index b79cd5030..84a83b544 100644
--- a/tests/kms_flip_event_leak.c
+++ b/tests/kms_flip_event_leak.c
@@ -110,7 +110,7 @@ igt_main
igt_display_reset(&data.display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(&data.display))
+ if (!intel_pipe_output_combo_valid(&data.display))
continue;
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
diff --git a/tests/kms_invalid_mode.c b/tests/kms_invalid_mode.c
index ec0483055..271408ba1 100644
--- a/tests/kms_invalid_mode.c
+++ b/tests/kms_invalid_mode.c
@@ -283,7 +283,7 @@ igt_main
igt_display_reset(&data.display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(&data.display))
+ if (!intel_pipe_output_combo_valid(&data.display))
continue;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe)) {
diff --git a/tests/kms_lease.c b/tests/kms_lease.c
index 29a774ae8..52080f11f 100644
--- a/tests/kms_lease.c
+++ b/tests/kms_lease.c
@@ -1227,7 +1227,7 @@ igt_main
igt_display_reset(display);
igt_output_set_pipe(output, data.pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(data.pipe),
diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c
index 65afc9f60..791bd3348 100644
--- a/tests/kms_pipe_crc_basic.c
+++ b/tests/kms_pipe_crc_basic.c
@@ -295,7 +295,7 @@ static bool pipe_output_combo_valid(igt_display_t *display,
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
ret = false;
igt_output_set_pipe(output, PIPE_NONE);
diff --git a/tests/kms_plane.c b/tests/kms_plane.c
index 10e16b638..3aa3bf6cb 100644
--- a/tests/kms_plane.c
+++ b/tests/kms_plane.c
@@ -1206,7 +1206,7 @@ static void run_test(data_t *data, void (*test)(data_t *, enum pipe))
igt_display_reset(&data->display);
igt_output_set_pipe(data->output, pipe);
- if (!i915_pipe_output_combo_valid(&data->display))
+ if (!intel_pipe_output_combo_valid(&data->display))
continue;
igt_output_set_pipe(data->output, PIPE_NONE);
diff --git a/tests/kms_plane_alpha_blend.c b/tests/kms_plane_alpha_blend.c
index 0d03e178a..5444cd337 100644
--- a/tests/kms_plane_alpha_blend.c
+++ b/tests/kms_plane_alpha_blend.c
@@ -655,7 +655,7 @@ static void run_subtests(data_t *data)
igt_display_reset(&data->display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(&data->display))
+ if (!intel_pipe_output_combo_valid(&data->display))
continue;
prepare_crtc(data, output, pipe);
diff --git a/tests/kms_plane_cursor.c b/tests/kms_plane_cursor.c
index 59b105c60..11fe77387 100644
--- a/tests/kms_plane_cursor.c
+++ b/tests/kms_plane_cursor.c
@@ -86,7 +86,7 @@ static void test_init(data_t *data, enum pipe pipe_id, igt_output_t *output)
data->cursor = igt_pipe_get_plane_type(data->pipe, DRM_PLANE_TYPE_CURSOR);
igt_output_set_pipe(data->output, data->pipe_id);
- igt_require(i915_pipe_output_combo_valid(display));
+ igt_require(intel_pipe_output_combo_valid(display));
igt_info("Using (pipe %s + %s) to run the subtest.\n",
kmstest_pipe_name(data->pipe_id), igt_output_name(data->output));
diff --git a/tests/kms_plane_lowres.c b/tests/kms_plane_lowres.c
index db9f5a54c..2b1050413 100644
--- a/tests/kms_plane_lowres.c
+++ b/tests/kms_plane_lowres.c
@@ -280,7 +280,7 @@ static void run_test(data_t *data, uint64_t modifier)
igt_display_reset(&data->display);
igt_output_set_pipe(data->output, data->pipe);
- if (!i915_pipe_output_combo_valid(&data->display))
+ if (!intel_pipe_output_combo_valid(&data->display))
continue;
data->pipe_crc = igt_pipe_crc_new(data->drm_fd, data->pipe,
diff --git a/tests/kms_plane_multiple.c b/tests/kms_plane_multiple.c
index 7dd9d586d..4ef3be3e4 100644
--- a/tests/kms_plane_multiple.c
+++ b/tests/kms_plane_multiple.c
@@ -386,7 +386,7 @@ static void run_test(data_t *data, uint64_t modifier)
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), output->name)
diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c
index a37abd16d..3b329e777 100644
--- a/tests/kms_plane_scaling.c
+++ b/tests/kms_plane_scaling.c
@@ -646,7 +646,7 @@ find_connected_pipe(igt_display_t *display, bool second, igt_output_t **output)
continue;
igt_output_set_pipe(*output, pipe);
- if (i915_pipe_output_combo_valid(display)) {
+ if (intel_pipe_output_combo_valid(display)) {
found = true;
if (second) {
@@ -1085,7 +1085,7 @@ pipe_output_combo_valid(igt_display_t *display,
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
ret = false;
igt_output_set_pipe(output, PIPE_NONE);
diff --git a/tests/kms_prime.c b/tests/kms_prime.c
index dd5ab993e..5f4d11993 100644
--- a/tests/kms_prime.c
+++ b/tests/kms_prime.c
@@ -92,7 +92,7 @@ static igt_output_t *setup_display(int importer_fd, igt_display_t *display,
igt_display_reset(display);
igt_output_set_pipe(output, *pipe);
- if (i915_pipe_output_combo_valid(display)) {
+ if (intel_pipe_output_combo_valid(display)) {
found = true;
break;
}
diff --git a/tests/kms_properties.c b/tests/kms_properties.c
index 2fe8dfa66..3f66f364b 100644
--- a/tests/kms_properties.c
+++ b/tests/kms_properties.c
@@ -244,7 +244,7 @@ static void plane_properties(igt_display_t *display, bool atomic)
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
found_any = found = true;
@@ -273,7 +273,7 @@ static void crtc_properties(igt_display_t *display, bool atomic)
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
found_any_valid_pipe = found = true;
@@ -305,7 +305,7 @@ static void connector_properties(igt_display_t *display, bool atomic)
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
found = true;
diff --git a/tests/kms_rmfb.c b/tests/kms_rmfb.c
index 50df42953..0e10a536c 100644
--- a/tests/kms_rmfb.c
+++ b/tests/kms_rmfb.c
@@ -161,7 +161,7 @@ run_rmfb_test(struct rmfb_data *data, bool reopen)
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe),
diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c
index 28b4fd27c..8169b165d 100644
--- a/tests/kms_rotation_crc.c
+++ b/tests/kms_rotation_crc.c
@@ -215,7 +215,7 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe,
cleanup_crtc(data);
igt_output_set_pipe(output, pipe);
- igt_require(i915_pipe_output_combo_valid(display));
+ igt_require(intel_pipe_output_combo_valid(display));
igt_plane_set_rotation(plane, IGT_ROTATION_0);
@@ -502,7 +502,7 @@ static void test_plane_rotation(data_t *data, int plane_type, bool test_bad_form
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
found = true;
@@ -824,7 +824,7 @@ static void test_multi_plane_rotation(data_t *data, enum pipe pipe)
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
found = true;
diff --git a/tests/kms_scaling_modes.c b/tests/kms_scaling_modes.c
index 906ae76de..50fb53109 100644
--- a/tests/kms_scaling_modes.c
+++ b/tests/kms_scaling_modes.c
@@ -99,7 +99,7 @@ static void test_scaling_mode(data_t *data, uint32_t flags)
continue;
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
igt_dynamic_f("%s-pipe-%s", output->name, kmstest_pipe_name(pipe))
diff --git a/tests/kms_sequence.c b/tests/kms_sequence.c
index c8a3d6bbd..c1ae8d1f4 100644
--- a/tests/kms_sequence.c
+++ b/tests/kms_sequence.c
@@ -288,7 +288,7 @@ igt_main
igt_display_reset(&data.display);
igt_output_set_pipe(output, p);
- if (!i915_pipe_output_combo_valid(&data.display))
+ if (!intel_pipe_output_combo_valid(&data.display))
continue;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(p)) {
diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
index 635a136ab..d45a57af5 100644
--- a/tests/kms_universal_plane.c
+++ b/tests/kms_universal_plane.c
@@ -793,7 +793,7 @@ pipe_output_combo_valid(igt_display_t *display,
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
ret = false;
igt_output_set_pipe(output, PIPE_NONE);
diff --git a/tests/kms_vblank.c b/tests/kms_vblank.c
index da0ada78e..09814b8ea 100644
--- a/tests/kms_vblank.c
+++ b/tests/kms_vblank.c
@@ -183,7 +183,7 @@ pipe_output_combo_valid(igt_display_t *display,
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
ret = false;
igt_output_set_pipe(output, PIPE_NONE);
@@ -206,7 +206,7 @@ static void crtc_id_subtest(data_t *data, int fd)
igt_display_reset(display);
igt_output_set_pipe(output, p);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
igt_info("Using (pipe %s + %s) to run the subtest.\n",
@@ -532,7 +532,7 @@ static void invalid_subtest(data_t *data, int fd)
data->output = output;
igt_output_set_pipe(output, pipe);
- igt_require(i915_pipe_output_combo_valid(display));
+ igt_require(intel_pipe_output_combo_valid(display));
igt_info("Using (pipe %s + %s) to run the subtest.\n",
kmstest_pipe_name(pipe), igt_output_name(output));
diff --git a/tests/kms_vrr.c b/tests/kms_vrr.c
index d2d79c4eb..cd136593c 100644
--- a/tests/kms_vrr.c
+++ b/tests/kms_vrr.c
@@ -477,7 +477,7 @@ run_vrr_test(data_t *data, test_t test, uint32_t flags)
igt_display_reset(&data->display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(&data->display))
+ if (!intel_pipe_output_combo_valid(&data->display))
continue;
igt_dynamic_f("pipe-%s-%s",
--
2.40.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for tests: s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/
2023-05-04 11:51 [igt-dev] [i-g-t] tests: s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/ Bhanuprakash Modem
@ 2023-05-04 14:38 ` Patchwork
2023-05-04 18:06 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2023-05-16 13:05 ` [igt-dev] [i-g-t] " Sharma, Swati2
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2023-05-04 14:38 UTC (permalink / raw)
To: Bhanuprakash Modem; +Cc: igt-dev
[-- Attachment #1: Type: text/plain, Size: 4781 bytes --]
== Series Details ==
Series: tests: s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/
URL : https://patchwork.freedesktop.org/series/117280/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13108 -> IGTPW_8910
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/index.html
Participating hosts (40 -> 38)
------------------------------
Missing (2): bat-atsm-1 fi-snb-2520m
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_8910:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@i915_pm_rpm@basic-rte:
- {bat-mtlp-8}: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/bat-mtlp-8/igt@i915_pm_rpm@basic-rte.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/bat-mtlp-8/igt@i915_pm_rpm@basic-rte.html
Known issues
------------
Here are the changes found in IGTPW_8910 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s0@smem:
- bat-rpls-2: [PASS][3] -> [ABORT][4] ([i915#6687])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/bat-rpls-2/igt@gem_exec_suspend@basic-s0@smem.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/bat-rpls-2/igt@gem_exec_suspend@basic-s0@smem.html
* igt@i915_selftest@live@gt_lrc:
- bat-rplp-1: [PASS][5] -> [INCOMPLETE][6] ([i915#4983] / [i915#7609] / [i915#7913])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/bat-rplp-1/igt@i915_selftest@live@gt_lrc.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/bat-rplp-1/igt@i915_selftest@live@gt_lrc.html
* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- fi-bsw-nick: NOTRUN -> [SKIP][7] ([fdo#109271]) +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/fi-bsw-nick/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
#### Possible fixes ####
* igt@i915_selftest@live@execlists:
- fi-bsw-nick: [ABORT][8] ([i915#7911] / [i915#7913]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/fi-bsw-nick/igt@i915_selftest@live@execlists.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/fi-bsw-nick/igt@i915_selftest@live@execlists.html
* igt@i915_selftest@live@mman:
- bat-rpls-2: [TIMEOUT][10] ([i915#6794] / [i915#7392]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/bat-rpls-2/igt@i915_selftest@live@mman.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/bat-rpls-2/igt@i915_selftest@live@mman.html
* igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-d-dp-1:
- bat-dg2-8: [FAIL][12] ([i915#7932]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-d-dp-1.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-d-dp-1.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
[i915#6794]: https://gitlab.freedesktop.org/drm/intel/issues/6794
[i915#7392]: https://gitlab.freedesktop.org/drm/intel/issues/7392
[i915#7609]: https://gitlab.freedesktop.org/drm/intel/issues/7609
[i915#7911]: https://gitlab.freedesktop.org/drm/intel/issues/7911
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7932]: https://gitlab.freedesktop.org/drm/intel/issues/7932
[i915#8379]: https://gitlab.freedesktop.org/drm/intel/issues/8379
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_7277 -> IGTPW_8910
CI-20190529: 20190529
CI_DRM_13108: 3ddac02bdbb0e147d2fd025029955aca7c2798a9 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_8910: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/index.html
IGT_7277: 1cb3507f3ff28d11bd5cfabcde576fe78ddab571 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Testlist changes
----------------
-igt@kms_dsc@dsc-with-output-formats
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/index.html
[-- Attachment #2: Type: text/html, Size: 5474 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for tests: s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/
2023-05-04 11:51 [igt-dev] [i-g-t] tests: s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/ Bhanuprakash Modem
2023-05-04 14:38 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
@ 2023-05-04 18:06 ` Patchwork
2023-05-16 13:05 ` [igt-dev] [i-g-t] " Sharma, Swati2
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2023-05-04 18:06 UTC (permalink / raw)
To: Modem, Bhanuprakash; +Cc: igt-dev
[-- Attachment #1: Type: text/plain, Size: 16922 bytes --]
== Series Details ==
Series: tests: s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/
URL : https://patchwork.freedesktop.org/series/117280/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13108_full -> IGTPW_8910_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/index.html
Participating hosts (8 -> 7)
------------------------------
Missing (1): shard-rkl0
Known issues
------------
Here are the changes found in IGTPW_8910_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-apl: [PASS][1] -> [FAIL][2] ([i915#2842])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-apl3/igt@gem_exec_fair@basic-pace-solo@rcs0.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-apl3/igt@gem_exec_fair@basic-pace-solo@rcs0.html
* igt@gem_exec_fair@basic-pace@vcs0:
- shard-glk: [PASS][3] -> [FAIL][4] ([i915#2842]) +2 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-glk7/igt@gem_exec_fair@basic-pace@vcs0.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-glk1/igt@gem_exec_fair@basic-pace@vcs0.html
* igt@gem_lmem_swapping@verify-random-ccs:
- shard-glk: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#4613]) +2 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-glk1/igt@gem_lmem_swapping@verify-random-ccs.html
* igt@gen9_exec_parse@bb-large:
- shard-apl: [PASS][6] -> [TIMEOUT][7] ([i915#4639])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-apl6/igt@gen9_exec_parse@bb-large.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-apl4/igt@gen9_exec_parse@bb-large.html
* igt@i915_pm_dc@dc9-dpms:
- shard-apl: [PASS][8] -> [SKIP][9] ([fdo#109271])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-apl3/igt@i915_pm_dc@dc9-dpms.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-apl3/igt@i915_pm_dc@dc9-dpms.html
* igt@kms_atomic@plane-primary-overlay-mutable-zpos:
- shard-glk: NOTRUN -> [SKIP][10] ([fdo#109271]) +84 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-glk1/igt@kms_atomic@plane-primary-overlay-mutable-zpos.html
* igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_rc_ccs_cc:
- shard-glk: NOTRUN -> [SKIP][11] ([fdo#109271] / [i915#3886]) +3 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-glk2/igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_content_protection@atomic:
- shard-snb: NOTRUN -> [SKIP][12] ([fdo#109271]) +79 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-snb4/igt@kms_content_protection@atomic.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-glk: [PASS][13] -> [FAIL][14] ([i915#2346]) +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-glk2/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-glk6/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
- shard-apl: [PASS][15] -> [FAIL][16] ([i915#2346])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-apl7/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-apl4/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
* igt@kms_draw_crc@draw-method-blt@xrgb2101010-ytiled:
- shard-glk: NOTRUN -> [DMESG-WARN][17] ([i915#7936])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-glk5/igt@kms_draw_crc@draw-method-blt@xrgb2101010-ytiled.html
* igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a2:
- shard-glk: [PASS][18] -> [FAIL][19] ([i915#79])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-glk9/igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a2.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-glk9/igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a2.html
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area:
- shard-glk: NOTRUN -> [SKIP][20] ([fdo#109271] / [i915#658])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-glk9/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area.html
#### Possible fixes ####
* igt@drm_fdinfo@most-busy-idle-check-all@rcs0:
- {shard-rkl}: [FAIL][21] ([i915#7742]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-rkl-7/igt@drm_fdinfo@most-busy-idle-check-all@rcs0.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-rkl-6/igt@drm_fdinfo@most-busy-idle-check-all@rcs0.html
* igt@gem_barrier_race@remote-request@rcs0:
- {shard-tglu}: [ABORT][23] ([i915#8211] / [i915#8234]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-tglu-8/igt@gem_barrier_race@remote-request@rcs0.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-tglu-2/igt@gem_barrier_race@remote-request@rcs0.html
* igt@gem_ctx_exec@basic-nohangcheck:
- {shard-rkl}: [FAIL][25] ([i915#6268]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-rkl-3/igt@gem_ctx_exec@basic-nohangcheck.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-rkl-1/igt@gem_ctx_exec@basic-nohangcheck.html
* igt@gem_eio@reset-stress:
- shard-snb: [TIMEOUT][27] ([i915#3063]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-snb7/igt@gem_eio@reset-stress.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-snb6/igt@gem_eio@reset-stress.html
* igt@gem_eio@unwedge-stress:
- {shard-dg1}: [FAIL][29] ([i915#5784]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-dg1-18/igt@gem_eio@unwedge-stress.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-dg1-12/igt@gem_eio@unwedge-stress.html
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [FAIL][31] ([i915#2842]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-glk4/igt@gem_exec_fair@basic-pace-share@rcs0.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-glk4/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@gen9_exec_parse@allowed-single:
- shard-glk: [ABORT][33] ([i915#5566]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-glk2/igt@gen9_exec_parse@allowed-single.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-glk1/igt@gen9_exec_parse@allowed-single.html
* igt@i915_module_load@reload-no-display:
- shard-snb: [ABORT][35] ([i915#4528] / [i915#8393]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-snb4/igt@i915_module_load@reload-no-display.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-snb1/igt@i915_module_load@reload-no-display.html
* igt@i915_pm_dc@dc6-dpms:
- {shard-tglu}: [FAIL][37] ([i915#3989] / [i915#454]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-tglu-9/igt@i915_pm_dc@dc6-dpms.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-tglu-10/igt@i915_pm_dc@dc6-dpms.html
* igt@i915_pm_rpm@dpms-mode-unset-non-lpsp:
- {shard-rkl}: [SKIP][39] ([i915#1397]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-rkl-7/igt@i915_pm_rpm@dpms-mode-unset-non-lpsp.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-rkl-6/igt@i915_pm_rpm@dpms-mode-unset-non-lpsp.html
* igt@i915_pm_rps@waitboost:
- {shard-dg1}: [FAIL][41] ([i915#8229]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-dg1-18/igt@i915_pm_rps@waitboost.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-dg1-15/igt@i915_pm_rps@waitboost.html
* igt@kms_cursor_legacy@single-bo@pipe-b:
- {shard-rkl}: [INCOMPLETE][43] ([i915#8011]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-rkl-7/igt@kms_cursor_legacy@single-bo@pipe-b.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-rkl-2/igt@kms_cursor_legacy@single-bo@pipe-b.html
* igt@kms_vblank@pipe-c-accuracy-idle:
- shard-glk: [FAIL][45] ([i915#43]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-glk3/igt@kms_vblank@pipe-c-accuracy-idle.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-glk2/igt@kms_vblank@pipe-c-accuracy-idle.html
* igt@perf@stress-open-close@0-rcs0:
- shard-glk: [ABORT][47] ([i915#5213] / [i915#7941]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-glk1/igt@perf@stress-open-close@0-rcs0.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-glk5/igt@perf@stress-open-close@0-rcs0.html
* igt@perf_pmu@idle@rcs0:
- {shard-rkl}: [FAIL][49] ([i915#4349]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13108/shard-rkl-4/igt@perf_pmu@idle@rcs0.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/shard-rkl-6/igt@perf_pmu@idle@rcs0.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109300]: https://bugs.freedesktop.org/show_bug.cgi?id=109300
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#284]: https://gitlab.freedesktop.org/drm/intel/issues/284
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#3023]: https://gitlab.freedesktop.org/drm/intel/issues/3023
[i915#3063]: https://gitlab.freedesktop.org/drm/intel/issues/3063
[i915#315]: https://gitlab.freedesktop.org/drm/intel/issues/315
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3361]: https://gitlab.freedesktop.org/drm/intel/issues/3361
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3469]: https://gitlab.freedesktop.org/drm/intel/issues/3469
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3743]: https://gitlab.freedesktop.org/drm/intel/issues/3743
[i915#3804]: https://gitlab.freedesktop.org/drm/intel/issues/3804
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3989]: https://gitlab.freedesktop.org/drm/intel/issues/3989
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#43]: https://gitlab.freedesktop.org/drm/intel/issues/43
[i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
[i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525
[i915#4528]: https://gitlab.freedesktop.org/drm/intel/issues/4528
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4639]: https://gitlab.freedesktop.org/drm/intel/issues/4639
[i915#4860]: https://gitlab.freedesktop.org/drm/intel/issues/4860
[i915#4936]: https://gitlab.freedesktop.org/drm/intel/issues/4936
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5213]: https://gitlab.freedesktop.org/drm/intel/issues/5213
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#5493]: https://gitlab.freedesktop.org/drm/intel/issues/5493
[i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268
[i915#6301]: https://gitlab.freedesktop.org/drm/intel/issues/6301
[i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
[i915#7461]: https://gitlab.freedesktop.org/drm/intel/issues/7461
[i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#7936]: https://gitlab.freedesktop.org/drm/intel/issues/7936
[i915#7941]: https://gitlab.freedesktop.org/drm/intel/issues/7941
[i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011
[i915#8211]: https://gitlab.freedesktop.org/drm/intel/issues/8211
[i915#8229]: https://gitlab.freedesktop.org/drm/intel/issues/8229
[i915#8234]: https://gitlab.freedesktop.org/drm/intel/issues/8234
[i915#8311]: https://gitlab.freedesktop.org/drm/intel/issues/8311
[i915#8381]: https://gitlab.freedesktop.org/drm/intel/issues/8381
[i915#8393]: https://gitlab.freedesktop.org/drm/intel/issues/8393
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_7277 -> IGTPW_8910
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_13108: 3ddac02bdbb0e147d2fd025029955aca7c2798a9 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_8910: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/index.html
IGT_7277: 1cb3507f3ff28d11bd5cfabcde576fe78ddab571 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8910/index.html
[-- Attachment #2: Type: text/html, Size: 14143 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [igt-dev] [i-g-t] tests: s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/
2023-05-04 11:51 [igt-dev] [i-g-t] tests: s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/ Bhanuprakash Modem
2023-05-04 14:38 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2023-05-04 18:06 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
@ 2023-05-16 13:05 ` Sharma, Swati2
2 siblings, 0 replies; 5+ messages in thread
From: Sharma, Swati2 @ 2023-05-16 13:05 UTC (permalink / raw)
To: Bhanuprakash Modem, igt-dev
LGTM
Reviewed-by: Swati Sharma <swati2.sharma@intel.com>
On 04-May-23 5:21 PM, Bhanuprakash Modem wrote:
> As i915_pipe_output_combo_valid() is no more i915 specific, and
> it supports both i915 & XE then rename the helper.
>
> s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/
>
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
> ---
> lib/igt_kms.c | 4 ++--
> lib/igt_kms.h | 2 +-
> tests/i915/kms_big_fb.c | 2 +-
> tests/i915/kms_busy.c | 2 +-
> tests/i915/kms_ccs.c | 2 +-
> tests/i915/kms_cdclk.c | 4 ++--
> tests/i915/kms_draw_crc.c | 2 +-
> tests/i915/kms_dsc.c | 2 +-
> tests/i915/kms_fence_pin_leak.c | 2 +-
> tests/i915/kms_flip_scaled_crc.c | 4 ++--
> tests/i915/kms_flip_tiling.c | 2 +-
> tests/i915/kms_frontbuffer_tracking.c | 2 +-
> tests/i915/kms_mmap_write_crc.c | 2 +-
> tests/i915/kms_psr.c | 2 +-
> tests/i915/kms_psr2_sf.c | 2 +-
> tests/i915/kms_psr2_su.c | 2 +-
> tests/i915/kms_psr_stress_test.c | 2 +-
> tests/i915/kms_pwrite_crc.c | 2 +-
> tests/kms_async_flips.c | 2 +-
> tests/kms_atomic.c | 2 +-
> tests/kms_atomic_interruptible.c | 2 +-
> tests/kms_atomic_transition.c | 6 +++---
> tests/kms_color_helper.c | 2 +-
> tests/kms_concurrent.c | 2 +-
> tests/kms_content_protection.c | 2 +-
> tests/kms_cursor_crc.c | 2 +-
> tests/kms_cursor_edge_walk.c | 2 +-
> tests/kms_cursor_legacy.c | 2 +-
> tests/kms_display_modes.c | 2 +-
> tests/kms_dp_tiled_display.c | 2 +-
> tests/kms_flip_event_leak.c | 2 +-
> tests/kms_invalid_mode.c | 2 +-
> tests/kms_lease.c | 2 +-
> tests/kms_pipe_crc_basic.c | 2 +-
> tests/kms_plane.c | 2 +-
> tests/kms_plane_alpha_blend.c | 2 +-
> tests/kms_plane_cursor.c | 2 +-
> tests/kms_plane_lowres.c | 2 +-
> tests/kms_plane_multiple.c | 2 +-
> tests/kms_plane_scaling.c | 4 ++--
> tests/kms_prime.c | 2 +-
> tests/kms_properties.c | 6 +++---
> tests/kms_rmfb.c | 2 +-
> tests/kms_rotation_crc.c | 6 +++---
> tests/kms_scaling_modes.c | 2 +-
> tests/kms_sequence.c | 2 +-
> tests/kms_universal_plane.c | 2 +-
> tests/kms_vblank.c | 6 +++---
> tests/kms_vrr.c | 2 +-
> 49 files changed, 61 insertions(+), 61 deletions(-)
>
> diff --git a/lib/igt_kms.c b/lib/igt_kms.c
> index e085e234a..57cc7b39b 100644
> --- a/lib/igt_kms.c
> +++ b/lib/igt_kms.c
> @@ -5975,7 +5975,7 @@ bool igt_parse_mode_string(const char *mode_string, drmModeModeInfo *mode)
> }
>
> /*
> - * i915_pipe_output_combo_valid:
> + * intel_pipe_output_combo_valid:
> * @display: a pointer to an #igt_display_t structure
> *
> * Every individual test must use igt_output_set_pipe() before calling this
> @@ -5993,7 +5993,7 @@ bool igt_parse_mode_string(const char *mode_string, drmModeModeInfo *mode)
> *
> * Returns: true if a valid pipe/output mode combo found, else false
> */
> -bool i915_pipe_output_combo_valid(igt_display_t *display)
> +bool intel_pipe_output_combo_valid(igt_display_t *display)
> {
> int combo = 0;
> igt_output_t *output;
> diff --git a/lib/igt_kms.h b/lib/igt_kms.h
> index 483b41651..bb6e62946 100644
> --- a/lib/igt_kms.h
> +++ b/lib/igt_kms.h
> @@ -996,6 +996,6 @@ int igt_get_max_dotclock(int fd);
> bool igt_bigjoiner_possible(drmModeModeInfo *mode, int max_dotclock);
> bool igt_check_bigjoiner_support(igt_display_t *display);
> bool igt_parse_mode_string(const char *mode_string, drmModeModeInfo *mode);
> -bool i915_pipe_output_combo_valid(igt_display_t *display);
> +bool intel_pipe_output_combo_valid(igt_display_t *display);
>
> #endif /* __IGT_KMS_H__ */
> diff --git a/tests/i915/kms_big_fb.c b/tests/i915/kms_big_fb.c
> index a0d5ef730..2ba88f2c3 100644
> --- a/tests/i915/kms_big_fb.c
> +++ b/tests/i915/kms_big_fb.c
> @@ -608,7 +608,7 @@ static void test_scanout(data_t *data)
> igt_display_reset(&data->display);
>
> igt_output_set_pipe(data->output, data->pipe);
> - if (!i915_pipe_output_combo_valid(&data->display))
> + if (!intel_pipe_output_combo_valid(&data->display))
> continue;
>
> if (data->async_flip_test) {
> diff --git a/tests/i915/kms_busy.c b/tests/i915/kms_busy.c
> index 20d3058fb..c7b74f0fb 100644
> --- a/tests/i915/kms_busy.c
> +++ b/tests/i915/kms_busy.c
> @@ -319,7 +319,7 @@ pipe_output_combo_valid(igt_display_t *dpy,
> igt_display_reset(dpy);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(dpy))
> + if (!intel_pipe_output_combo_valid(dpy))
> ret = false;
> igt_output_set_pipe(output, PIPE_NONE);
>
> diff --git a/tests/i915/kms_ccs.c b/tests/i915/kms_ccs.c
> index 1b3462ea9..9e5968c09 100644
> --- a/tests/i915/kms_ccs.c
> +++ b/tests/i915/kms_ccs.c
> @@ -596,7 +596,7 @@ static void test_output(data_t *data, const int testnum)
> igt_display_reset(&data->display);
>
> igt_output_set_pipe(data->output, data->pipe);
> - if (i915_pipe_output_combo_valid(&data->display)) {
> + if (intel_pipe_output_combo_valid(&data->display)) {
> found = true;
> break;
> }
> diff --git a/tests/i915/kms_cdclk.c b/tests/i915/kms_cdclk.c
> index 0f9b8dc58..9e8044062 100644
> --- a/tests/i915/kms_cdclk.c
> +++ b/tests/i915/kms_cdclk.c
> @@ -283,7 +283,7 @@ static void test_mode_transition_on_all_outputs(data_t *data)
> igt_output_override_mode(output, mode_hi);
> i++;
> }
> - igt_require(i915_pipe_output_combo_valid(display));
> + igt_require(intel_pipe_output_combo_valid(display));
> igt_display_reset(display);
>
> igt_create_pattern_fb(data->drm_fd, width, height, DRM_FORMAT_XRGB8888,
> @@ -352,7 +352,7 @@ static void run_cdclk_test(data_t *data, uint32_t flags)
>
> for_each_pipe_with_valid_output(display, pipe, output) {
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display)) {
> + if (!intel_pipe_output_combo_valid(display)) {
> igt_output_set_pipe(output, PIPE_NONE);
> continue;
> }
> diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c
> index db6d71f2e..3f78bac8b 100644
> --- a/tests/i915/kms_draw_crc.c
> +++ b/tests/i915/kms_draw_crc.c
> @@ -63,7 +63,7 @@ static void find_modeset_params(void)
> igt_display_reset(&display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(&display))
> + if (!intel_pipe_output_combo_valid(&display))
> continue;
>
> mode = igt_output_get_mode(output);
> diff --git a/tests/i915/kms_dsc.c b/tests/i915/kms_dsc.c
> index c4dfc9251..98dc56479 100644
> --- a/tests/i915/kms_dsc.c
> +++ b/tests/i915/kms_dsc.c
> @@ -83,7 +83,7 @@ static bool pipe_output_combo_valid(data_t *data)
> igt_output_set_pipe(output, data->pipe);
> igt_output_override_mode(output, mode);
>
> - if (!i915_pipe_output_combo_valid(&data->display))
> + if (!intel_pipe_output_combo_valid(&data->display))
> ret = false;
>
> igt_output_set_pipe(output, PIPE_NONE);
> diff --git a/tests/i915/kms_fence_pin_leak.c b/tests/i915/kms_fence_pin_leak.c
> index 63657a742..6b678668e 100644
> --- a/tests/i915/kms_fence_pin_leak.c
> +++ b/tests/i915/kms_fence_pin_leak.c
> @@ -202,7 +202,7 @@ static void run_test(data_t *data)
> igt_display_reset(display);
>
> igt_output_set_pipe(output, p);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> continue;
>
> run_single_test(data, p, output);
> diff --git a/tests/i915/kms_flip_scaled_crc.c b/tests/i915/kms_flip_scaled_crc.c
> index f5dc430e3..987f5f54a 100644
> --- a/tests/i915/kms_flip_scaled_crc.c
> +++ b/tests/i915/kms_flip_scaled_crc.c
> @@ -660,7 +660,7 @@ igt_main
> igt_output_set_pipe(output, pipe);
> igt_output_override_mode(output, modetoset);
>
> - if (modetoset && i915_pipe_output_combo_valid(&data.display)) {
> + if (modetoset && intel_pipe_output_combo_valid(&data.display)) {
> found = true;
> igt_dynamic_f("pipe-%s-valid-mode", kmstest_pipe_name(pipe))
> run_tests(&data, index, pipe, output, modetoset);
> @@ -672,7 +672,7 @@ igt_main
> igt_display_reset(&data.display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(&data.display))
> + if (!intel_pipe_output_combo_valid(&data.display))
> continue;
>
> modetoset = NULL;
> diff --git a/tests/i915/kms_flip_tiling.c b/tests/i915/kms_flip_tiling.c
> index a22f12382..01c27efef 100644
> --- a/tests/i915/kms_flip_tiling.c
> +++ b/tests/i915/kms_flip_tiling.c
> @@ -199,7 +199,7 @@ igt_main
> pipe_crc_free(&data);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(&data.display))
> + if (!intel_pipe_output_combo_valid(&data.display))
> continue;
>
> plane = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
> diff --git a/tests/i915/kms_frontbuffer_tracking.c b/tests/i915/kms_frontbuffer_tracking.c
> index 650e14a77..c7af27be4 100644
> --- a/tests/i915/kms_frontbuffer_tracking.c
> +++ b/tests/i915/kms_frontbuffer_tracking.c
> @@ -415,7 +415,7 @@ static bool find_connector(bool edp_only, bool pipe_a,
>
> igt_output_set_pipe(output, pipe);
> igt_output_override_mode(output, connector_get_mode(output));
> - if (i915_pipe_output_combo_valid(&drm.display)) {
> + if (intel_pipe_output_combo_valid(&drm.display)) {
> *ret_output = output;
> *ret_pipe = pipe;
> return true;
> diff --git a/tests/i915/kms_mmap_write_crc.c b/tests/i915/kms_mmap_write_crc.c
> index bc51975f6..5f7750041 100644
> --- a/tests/i915/kms_mmap_write_crc.c
> +++ b/tests/i915/kms_mmap_write_crc.c
> @@ -280,7 +280,7 @@ igt_main_args("n", NULL, NULL, opt_handler, NULL)
> igt_display_reset(&data.display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(&data.display))
> + if (!intel_pipe_output_combo_valid(&data.display))
> continue;
>
> igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe),
> diff --git a/tests/i915/kms_psr.c b/tests/i915/kms_psr.c
> index 0e8d7f4f0..4f8a49b36 100644
> --- a/tests/i915/kms_psr.c
> +++ b/tests/i915/kms_psr.c
> @@ -105,7 +105,7 @@ static void setup_output(data_t *data)
>
> igt_display_reset(display);
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> continue;
>
> data->crtc_id = output->config.crtc->crtc_id;
> diff --git a/tests/i915/kms_psr2_sf.c b/tests/i915/kms_psr2_sf.c
> index 4cf986440..d55b818ef 100644
> --- a/tests/i915/kms_psr2_sf.c
> +++ b/tests/i915/kms_psr2_sf.c
> @@ -879,7 +879,7 @@ pipe_output_combo_valid(igt_display_t *display,
> igt_display_reset(display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> ret = false;
> igt_output_set_pipe(output, PIPE_NONE);
>
> diff --git a/tests/i915/kms_psr2_su.c b/tests/i915/kms_psr2_su.c
> index 65e67b8c9..43fed4241 100644
> --- a/tests/i915/kms_psr2_su.c
> +++ b/tests/i915/kms_psr2_su.c
> @@ -106,7 +106,7 @@ static void setup_output(data_t *data)
>
> igt_display_reset(display);
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> continue;
>
> data->output = output;
> diff --git a/tests/i915/kms_psr_stress_test.c b/tests/i915/kms_psr_stress_test.c
> index a4cb3194e..0812bcdd1 100644
> --- a/tests/i915/kms_psr_stress_test.c
> +++ b/tests/i915/kms_psr_stress_test.c
> @@ -74,7 +74,7 @@ static void setup_output(data_t *data)
>
> igt_display_reset(display);
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display)) {
> + if (!intel_pipe_output_combo_valid(display)) {
> igt_output_set_pipe(output, PIPE_NONE);
> continue;
> }
> diff --git a/tests/i915/kms_pwrite_crc.c b/tests/i915/kms_pwrite_crc.c
> index 3278d876d..e8481b545 100644
> --- a/tests/i915/kms_pwrite_crc.c
> +++ b/tests/i915/kms_pwrite_crc.c
> @@ -162,7 +162,7 @@ static void run_test(data_t *data)
> igt_display_reset(display);
>
> igt_output_set_pipe(data->output, data->pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> continue;
>
> prepare_crtc(data);
> diff --git a/tests/kms_async_flips.c b/tests/kms_async_flips.c
> index 51ffa523a..1b13b04dd 100644
> --- a/tests/kms_async_flips.c
> +++ b/tests/kms_async_flips.c
> @@ -554,7 +554,7 @@ static void run_test(data_t *data, void (*test)(data_t *))
> igt_display_reset(display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> continue;
>
> igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), output->name) {
> diff --git a/tests/kms_atomic.c b/tests/kms_atomic.c
> index 037db2d36..c2232bacb 100644
> --- a/tests/kms_atomic.c
> +++ b/tests/kms_atomic.c
> @@ -1312,7 +1312,7 @@ igt_main
> igt_display_reset(&display);
>
> igt_output_set_pipe(output, pipe);
> - if (i915_pipe_output_combo_valid(&display)) {
> + if (intel_pipe_output_combo_valid(&display)) {
> valid_config = true;
> break;
> }
> diff --git a/tests/kms_atomic_interruptible.c b/tests/kms_atomic_interruptible.c
> index 74b2e246a..a21830f26 100644
> --- a/tests/kms_atomic_interruptible.c
> +++ b/tests/kms_atomic_interruptible.c
> @@ -277,7 +277,7 @@ static bool pipe_output_combo_valid(igt_display_t *display,
> igt_display_reset(display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> ret = false;
> igt_output_set_pipe(output, PIPE_NONE);
>
> diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c
> index 9f39d033d..cd6df6cf2 100644
> --- a/tests/kms_atomic_transition.c
> +++ b/tests/kms_atomic_transition.c
> @@ -767,7 +767,7 @@ static unsigned set_combinations(data_t *data, unsigned mask, struct igt_fb *fb)
> continue;
>
> igt_output_set_pipe(output, pipe);
> - if (i915_pipe_output_combo_valid(&data->display)) {
> + if (intel_pipe_output_combo_valid(&data->display)) {
> mode = igt_output_get_mode(output);
> break;
> } else {
> @@ -857,7 +857,7 @@ retry:
> continue;
>
> igt_output_set_pipe(output, i);
> - if (i915_pipe_output_combo_valid(&data->display)) {
> + if (intel_pipe_output_combo_valid(&data->display)) {
> mode = igt_output_get_mode(output);
>
> igt_info("(pipe %s + %s), mode:",
> @@ -1013,7 +1013,7 @@ static bool pipe_output_combo_valid(igt_display_t *display,
> igt_display_reset(display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> ret = false;
> igt_output_set_pipe(output, PIPE_NONE);
>
> diff --git a/tests/kms_color_helper.c b/tests/kms_color_helper.c
> index b01c38ef6..c756b280e 100644
> --- a/tests/kms_color_helper.c
> +++ b/tests/kms_color_helper.c
> @@ -29,7 +29,7 @@ bool pipe_output_combo_valid(data_t *data, enum pipe pipe)
> bool ret = true;
>
> igt_output_set_pipe(data->output, pipe);
> - if (!i915_pipe_output_combo_valid(&data->display))
> + if (!intel_pipe_output_combo_valid(&data->display))
> ret = false;
> igt_output_set_pipe(data->output, PIPE_NONE);
>
> diff --git a/tests/kms_concurrent.c b/tests/kms_concurrent.c
> index e1e581723..1ba2d11be 100644
> --- a/tests/kms_concurrent.c
> +++ b/tests/kms_concurrent.c
> @@ -334,7 +334,7 @@ run_tests_for_pipe(data_t *data, enum pipe pipe)
> igt_display_reset(&data->display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(&data->display))
> + if (!intel_pipe_output_combo_valid(&data->display))
> continue;
>
> igt_output_set_pipe(output, PIPE_NONE);
> diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
> index 344cac505..0b12d9c2f 100644
> --- a/tests/kms_content_protection.c
> +++ b/tests/kms_content_protection.c
> @@ -509,7 +509,7 @@ test_content_protection(enum igt_commit_style s, int content_type)
> igt_display_reset(display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> continue;
>
> modeset_with_fb(pipe, output, s);
> diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c
> index 3a353a032..8e7f32aee 100644
> --- a/tests/kms_cursor_crc.c
> +++ b/tests/kms_cursor_crc.c
> @@ -713,7 +713,7 @@ static bool valid_pipe_output_combo(data_t *data)
> igt_display_reset(display);
> igt_output_set_pipe(data->output, data->pipe);
>
> - if (i915_pipe_output_combo_valid(display))
> + if (intel_pipe_output_combo_valid(display))
> ret = true;
>
> igt_output_set_pipe(data->output, PIPE_NONE);
> diff --git a/tests/kms_cursor_edge_walk.c b/tests/kms_cursor_edge_walk.c
> index 5f423a18f..e4323b18d 100644
> --- a/tests/kms_cursor_edge_walk.c
> +++ b/tests/kms_cursor_edge_walk.c
> @@ -375,7 +375,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
>
> igt_display_reset(&data.display);
> igt_output_set_pipe(data.output, data.pipe);
> - if (!i915_pipe_output_combo_valid(&data.display))
> + if (!intel_pipe_output_combo_valid(&data.display))
> continue;
>
> igt_output_set_pipe(data.output, PIPE_NONE);
> diff --git a/tests/kms_cursor_legacy.c b/tests/kms_cursor_legacy.c
> index 7df6a6125..7e689c485 100644
> --- a/tests/kms_cursor_legacy.c
> +++ b/tests/kms_cursor_legacy.c
> @@ -247,7 +247,7 @@ find_connected_pipe(igt_display_t *display, bool second, igt_output_t **output)
> continue;
>
> igt_output_set_pipe(*output, pipe);
> - if (i915_pipe_output_combo_valid(display)) {
> + if (intel_pipe_output_combo_valid(display)) {
> found = true;
>
> if (second) {
> diff --git a/tests/kms_display_modes.c b/tests/kms_display_modes.c
> index d69c7b931..9fbea228b 100644
> --- a/tests/kms_display_modes.c
> +++ b/tests/kms_display_modes.c
> @@ -156,7 +156,7 @@ static void run_extendedmode_test(data_t *data) {
> igt_output_set_pipe(output1, pipe1);
> igt_output_set_pipe(output2, pipe2);
>
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> continue;
>
> igt_dynamic_f("pipe-%s-%s-pipe-%s-%s",
> diff --git a/tests/kms_dp_tiled_display.c b/tests/kms_dp_tiled_display.c
> index 07b803a50..77d5352ac 100644
> --- a/tests/kms_dp_tiled_display.c
> +++ b/tests/kms_dp_tiled_display.c
> @@ -272,7 +272,7 @@ static void setup_mode(data_t *data)
> igt_require(found);
> igt_output_override_mode(output, mode);
> }
> - igt_require(i915_pipe_output_combo_valid(data->display));
> + igt_require(intel_pipe_output_combo_valid(data->display));
> igt_display_commit_atomic(data->display, DRM_MODE_ATOMIC_ALLOW_MODESET,
> NULL);
> }
> diff --git a/tests/kms_flip_event_leak.c b/tests/kms_flip_event_leak.c
> index b79cd5030..84a83b544 100644
> --- a/tests/kms_flip_event_leak.c
> +++ b/tests/kms_flip_event_leak.c
> @@ -110,7 +110,7 @@ igt_main
> igt_display_reset(&data.display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(&data.display))
> + if (!intel_pipe_output_combo_valid(&data.display))
> continue;
>
> igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
> diff --git a/tests/kms_invalid_mode.c b/tests/kms_invalid_mode.c
> index ec0483055..271408ba1 100644
> --- a/tests/kms_invalid_mode.c
> +++ b/tests/kms_invalid_mode.c
> @@ -283,7 +283,7 @@ igt_main
> igt_display_reset(&data.display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(&data.display))
> + if (!intel_pipe_output_combo_valid(&data.display))
> continue;
>
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe)) {
> diff --git a/tests/kms_lease.c b/tests/kms_lease.c
> index 29a774ae8..52080f11f 100644
> --- a/tests/kms_lease.c
> +++ b/tests/kms_lease.c
> @@ -1227,7 +1227,7 @@ igt_main
> igt_display_reset(display);
>
> igt_output_set_pipe(output, data.pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> continue;
>
> igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(data.pipe),
> diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c
> index 65afc9f60..791bd3348 100644
> --- a/tests/kms_pipe_crc_basic.c
> +++ b/tests/kms_pipe_crc_basic.c
> @@ -295,7 +295,7 @@ static bool pipe_output_combo_valid(igt_display_t *display,
> igt_display_reset(display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> ret = false;
> igt_output_set_pipe(output, PIPE_NONE);
>
> diff --git a/tests/kms_plane.c b/tests/kms_plane.c
> index 10e16b638..3aa3bf6cb 100644
> --- a/tests/kms_plane.c
> +++ b/tests/kms_plane.c
> @@ -1206,7 +1206,7 @@ static void run_test(data_t *data, void (*test)(data_t *, enum pipe))
> igt_display_reset(&data->display);
>
> igt_output_set_pipe(data->output, pipe);
> - if (!i915_pipe_output_combo_valid(&data->display))
> + if (!intel_pipe_output_combo_valid(&data->display))
> continue;
>
> igt_output_set_pipe(data->output, PIPE_NONE);
> diff --git a/tests/kms_plane_alpha_blend.c b/tests/kms_plane_alpha_blend.c
> index 0d03e178a..5444cd337 100644
> --- a/tests/kms_plane_alpha_blend.c
> +++ b/tests/kms_plane_alpha_blend.c
> @@ -655,7 +655,7 @@ static void run_subtests(data_t *data)
> igt_display_reset(&data->display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(&data->display))
> + if (!intel_pipe_output_combo_valid(&data->display))
> continue;
>
> prepare_crtc(data, output, pipe);
> diff --git a/tests/kms_plane_cursor.c b/tests/kms_plane_cursor.c
> index 59b105c60..11fe77387 100644
> --- a/tests/kms_plane_cursor.c
> +++ b/tests/kms_plane_cursor.c
> @@ -86,7 +86,7 @@ static void test_init(data_t *data, enum pipe pipe_id, igt_output_t *output)
> data->cursor = igt_pipe_get_plane_type(data->pipe, DRM_PLANE_TYPE_CURSOR);
>
> igt_output_set_pipe(data->output, data->pipe_id);
> - igt_require(i915_pipe_output_combo_valid(display));
> + igt_require(intel_pipe_output_combo_valid(display));
>
> igt_info("Using (pipe %s + %s) to run the subtest.\n",
> kmstest_pipe_name(data->pipe_id), igt_output_name(data->output));
> diff --git a/tests/kms_plane_lowres.c b/tests/kms_plane_lowres.c
> index db9f5a54c..2b1050413 100644
> --- a/tests/kms_plane_lowres.c
> +++ b/tests/kms_plane_lowres.c
> @@ -280,7 +280,7 @@ static void run_test(data_t *data, uint64_t modifier)
> igt_display_reset(&data->display);
> igt_output_set_pipe(data->output, data->pipe);
>
> - if (!i915_pipe_output_combo_valid(&data->display))
> + if (!intel_pipe_output_combo_valid(&data->display))
> continue;
>
> data->pipe_crc = igt_pipe_crc_new(data->drm_fd, data->pipe,
> diff --git a/tests/kms_plane_multiple.c b/tests/kms_plane_multiple.c
> index 7dd9d586d..4ef3be3e4 100644
> --- a/tests/kms_plane_multiple.c
> +++ b/tests/kms_plane_multiple.c
> @@ -386,7 +386,7 @@ static void run_test(data_t *data, uint64_t modifier)
> igt_display_reset(display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> continue;
>
> igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), output->name)
> diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c
> index a37abd16d..3b329e777 100644
> --- a/tests/kms_plane_scaling.c
> +++ b/tests/kms_plane_scaling.c
> @@ -646,7 +646,7 @@ find_connected_pipe(igt_display_t *display, bool second, igt_output_t **output)
> continue;
>
> igt_output_set_pipe(*output, pipe);
> - if (i915_pipe_output_combo_valid(display)) {
> + if (intel_pipe_output_combo_valid(display)) {
> found = true;
>
> if (second) {
> @@ -1085,7 +1085,7 @@ pipe_output_combo_valid(igt_display_t *display,
> igt_display_reset(display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> ret = false;
> igt_output_set_pipe(output, PIPE_NONE);
>
> diff --git a/tests/kms_prime.c b/tests/kms_prime.c
> index dd5ab993e..5f4d11993 100644
> --- a/tests/kms_prime.c
> +++ b/tests/kms_prime.c
> @@ -92,7 +92,7 @@ static igt_output_t *setup_display(int importer_fd, igt_display_t *display,
> igt_display_reset(display);
>
> igt_output_set_pipe(output, *pipe);
> - if (i915_pipe_output_combo_valid(display)) {
> + if (intel_pipe_output_combo_valid(display)) {
> found = true;
> break;
> }
> diff --git a/tests/kms_properties.c b/tests/kms_properties.c
> index 2fe8dfa66..3f66f364b 100644
> --- a/tests/kms_properties.c
> +++ b/tests/kms_properties.c
> @@ -244,7 +244,7 @@ static void plane_properties(igt_display_t *display, bool atomic)
> igt_display_reset(display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> continue;
>
> found_any = found = true;
> @@ -273,7 +273,7 @@ static void crtc_properties(igt_display_t *display, bool atomic)
> igt_display_reset(display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> continue;
>
> found_any_valid_pipe = found = true;
> @@ -305,7 +305,7 @@ static void connector_properties(igt_display_t *display, bool atomic)
> igt_display_reset(display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> continue;
>
> found = true;
> diff --git a/tests/kms_rmfb.c b/tests/kms_rmfb.c
> index 50df42953..0e10a536c 100644
> --- a/tests/kms_rmfb.c
> +++ b/tests/kms_rmfb.c
> @@ -161,7 +161,7 @@ run_rmfb_test(struct rmfb_data *data, bool reopen)
> igt_display_reset(display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> continue;
>
> igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe),
> diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c
> index 28b4fd27c..8169b165d 100644
> --- a/tests/kms_rotation_crc.c
> +++ b/tests/kms_rotation_crc.c
> @@ -215,7 +215,7 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe,
> cleanup_crtc(data);
>
> igt_output_set_pipe(output, pipe);
> - igt_require(i915_pipe_output_combo_valid(display));
> + igt_require(intel_pipe_output_combo_valid(display));
>
> igt_plane_set_rotation(plane, IGT_ROTATION_0);
>
> @@ -502,7 +502,7 @@ static void test_plane_rotation(data_t *data, int plane_type, bool test_bad_form
> igt_display_reset(display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> continue;
>
> found = true;
> @@ -824,7 +824,7 @@ static void test_multi_plane_rotation(data_t *data, enum pipe pipe)
> igt_display_reset(display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> continue;
>
> found = true;
> diff --git a/tests/kms_scaling_modes.c b/tests/kms_scaling_modes.c
> index 906ae76de..50fb53109 100644
> --- a/tests/kms_scaling_modes.c
> +++ b/tests/kms_scaling_modes.c
> @@ -99,7 +99,7 @@ static void test_scaling_mode(data_t *data, uint32_t flags)
> continue;
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> continue;
>
> igt_dynamic_f("%s-pipe-%s", output->name, kmstest_pipe_name(pipe))
> diff --git a/tests/kms_sequence.c b/tests/kms_sequence.c
> index c8a3d6bbd..c1ae8d1f4 100644
> --- a/tests/kms_sequence.c
> +++ b/tests/kms_sequence.c
> @@ -288,7 +288,7 @@ igt_main
> igt_display_reset(&data.display);
>
> igt_output_set_pipe(output, p);
> - if (!i915_pipe_output_combo_valid(&data.display))
> + if (!intel_pipe_output_combo_valid(&data.display))
> continue;
>
> igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(p)) {
> diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
> index 635a136ab..d45a57af5 100644
> --- a/tests/kms_universal_plane.c
> +++ b/tests/kms_universal_plane.c
> @@ -793,7 +793,7 @@ pipe_output_combo_valid(igt_display_t *display,
> igt_display_reset(display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> ret = false;
> igt_output_set_pipe(output, PIPE_NONE);
>
> diff --git a/tests/kms_vblank.c b/tests/kms_vblank.c
> index da0ada78e..09814b8ea 100644
> --- a/tests/kms_vblank.c
> +++ b/tests/kms_vblank.c
> @@ -183,7 +183,7 @@ pipe_output_combo_valid(igt_display_t *display,
> igt_display_reset(display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> ret = false;
> igt_output_set_pipe(output, PIPE_NONE);
>
> @@ -206,7 +206,7 @@ static void crtc_id_subtest(data_t *data, int fd)
> igt_display_reset(display);
>
> igt_output_set_pipe(output, p);
> - if (!i915_pipe_output_combo_valid(display))
> + if (!intel_pipe_output_combo_valid(display))
> continue;
>
> igt_info("Using (pipe %s + %s) to run the subtest.\n",
> @@ -532,7 +532,7 @@ static void invalid_subtest(data_t *data, int fd)
> data->output = output;
>
> igt_output_set_pipe(output, pipe);
> - igt_require(i915_pipe_output_combo_valid(display));
> + igt_require(intel_pipe_output_combo_valid(display));
>
> igt_info("Using (pipe %s + %s) to run the subtest.\n",
> kmstest_pipe_name(pipe), igt_output_name(output));
> diff --git a/tests/kms_vrr.c b/tests/kms_vrr.c
> index d2d79c4eb..cd136593c 100644
> --- a/tests/kms_vrr.c
> +++ b/tests/kms_vrr.c
> @@ -477,7 +477,7 @@ run_vrr_test(data_t *data, test_t test, uint32_t flags)
> igt_display_reset(&data->display);
>
> igt_output_set_pipe(output, pipe);
> - if (!i915_pipe_output_combo_valid(&data->display))
> + if (!intel_pipe_output_combo_valid(&data->display))
> continue;
>
> igt_dynamic_f("pipe-%s-%s",
^ permalink raw reply [flat|nested] 5+ messages in thread
* [igt-dev] [i-g-t] tests: s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/
@ 2023-05-16 16:55 Bhanuprakash Modem
0 siblings, 0 replies; 5+ messages in thread
From: Bhanuprakash Modem @ 2023-05-16 16:55 UTC (permalink / raw)
To: igt-dev
As i915_pipe_output_combo_valid() is no more i915 specific, and
it supports both i915 & XE then rename the helper.
s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/
V2: - Rebase
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
Reviewed-by: Swati Sharma <swati2.sharma@intel.com>
---
lib/igt_kms.c | 4 ++--
lib/igt_kms.h | 2 +-
tests/i915/kms_big_fb.c | 2 +-
tests/i915/kms_busy.c | 2 +-
tests/i915/kms_ccs.c | 2 +-
tests/i915/kms_cdclk.c | 4 ++--
tests/i915/kms_draw_crc.c | 2 +-
tests/i915/kms_dsc.c | 2 +-
tests/i915/kms_fence_pin_leak.c | 2 +-
tests/i915/kms_flip_scaled_crc.c | 4 ++--
tests/i915/kms_flip_tiling.c | 2 +-
tests/i915/kms_frontbuffer_tracking.c | 2 +-
tests/i915/kms_mmap_write_crc.c | 2 +-
tests/i915/kms_psr.c | 2 +-
tests/i915/kms_psr2_sf.c | 2 +-
tests/i915/kms_psr2_su.c | 2 +-
tests/i915/kms_psr_stress_test.c | 2 +-
tests/i915/kms_pwrite_crc.c | 2 +-
tests/kms_async_flips.c | 2 +-
tests/kms_atomic.c | 2 +-
tests/kms_atomic_interruptible.c | 2 +-
tests/kms_atomic_transition.c | 6 +++---
tests/kms_color_helper.c | 2 +-
tests/kms_concurrent.c | 2 +-
tests/kms_content_protection.c | 2 +-
tests/kms_cursor_crc.c | 2 +-
tests/kms_cursor_edge_walk.c | 2 +-
tests/kms_cursor_legacy.c | 2 +-
tests/kms_display_modes.c | 2 +-
tests/kms_dp_tiled_display.c | 2 +-
tests/kms_flip_event_leak.c | 2 +-
tests/kms_invalid_mode.c | 2 +-
tests/kms_lease.c | 2 +-
tests/kms_pipe_crc_basic.c | 2 +-
tests/kms_plane.c | 2 +-
tests/kms_plane_alpha_blend.c | 2 +-
tests/kms_plane_cursor.c | 2 +-
tests/kms_plane_lowres.c | 2 +-
tests/kms_plane_multiple.c | 2 +-
tests/kms_plane_scaling.c | 4 ++--
tests/kms_prime.c | 2 +-
tests/kms_properties.c | 6 +++---
tests/kms_rmfb.c | 2 +-
tests/kms_rotation_crc.c | 6 +++---
tests/kms_scaling_modes.c | 2 +-
tests/kms_sequence.c | 2 +-
tests/kms_universal_plane.c | 2 +-
tests/kms_vblank.c | 6 +++---
tests/kms_vrr.c | 2 +-
49 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index c54841486..fcafcb66e 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -5993,7 +5993,7 @@ bool igt_parse_mode_string(const char *mode_string, drmModeModeInfo *mode)
}
/*
- * i915_pipe_output_combo_valid:
+ * intel_pipe_output_combo_valid:
* @display: a pointer to an #igt_display_t structure
*
* Every individual test must use igt_output_set_pipe() before calling this
@@ -6011,7 +6011,7 @@ bool igt_parse_mode_string(const char *mode_string, drmModeModeInfo *mode)
*
* Returns: true if a valid pipe/output mode combo found, else false
*/
-bool i915_pipe_output_combo_valid(igt_display_t *display)
+bool intel_pipe_output_combo_valid(igt_display_t *display)
{
int combo = 0;
igt_output_t *output;
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index 1b6988c17..afa75b334 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -1003,6 +1003,6 @@ int igt_get_max_dotclock(int fd);
bool igt_bigjoiner_possible(drmModeModeInfo *mode, int max_dotclock);
bool igt_check_bigjoiner_support(igt_display_t *display);
bool igt_parse_mode_string(const char *mode_string, drmModeModeInfo *mode);
-bool i915_pipe_output_combo_valid(igt_display_t *display);
+bool intel_pipe_output_combo_valid(igt_display_t *display);
#endif /* __IGT_KMS_H__ */
diff --git a/tests/i915/kms_big_fb.c b/tests/i915/kms_big_fb.c
index a0d5ef730..2ba88f2c3 100644
--- a/tests/i915/kms_big_fb.c
+++ b/tests/i915/kms_big_fb.c
@@ -608,7 +608,7 @@ static void test_scanout(data_t *data)
igt_display_reset(&data->display);
igt_output_set_pipe(data->output, data->pipe);
- if (!i915_pipe_output_combo_valid(&data->display))
+ if (!intel_pipe_output_combo_valid(&data->display))
continue;
if (data->async_flip_test) {
diff --git a/tests/i915/kms_busy.c b/tests/i915/kms_busy.c
index 20d3058fb..c7b74f0fb 100644
--- a/tests/i915/kms_busy.c
+++ b/tests/i915/kms_busy.c
@@ -319,7 +319,7 @@ pipe_output_combo_valid(igt_display_t *dpy,
igt_display_reset(dpy);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(dpy))
+ if (!intel_pipe_output_combo_valid(dpy))
ret = false;
igt_output_set_pipe(output, PIPE_NONE);
diff --git a/tests/i915/kms_ccs.c b/tests/i915/kms_ccs.c
index 1b3462ea9..9e5968c09 100644
--- a/tests/i915/kms_ccs.c
+++ b/tests/i915/kms_ccs.c
@@ -596,7 +596,7 @@ static void test_output(data_t *data, const int testnum)
igt_display_reset(&data->display);
igt_output_set_pipe(data->output, data->pipe);
- if (i915_pipe_output_combo_valid(&data->display)) {
+ if (intel_pipe_output_combo_valid(&data->display)) {
found = true;
break;
}
diff --git a/tests/i915/kms_cdclk.c b/tests/i915/kms_cdclk.c
index 0f9b8dc58..9e8044062 100644
--- a/tests/i915/kms_cdclk.c
+++ b/tests/i915/kms_cdclk.c
@@ -283,7 +283,7 @@ static void test_mode_transition_on_all_outputs(data_t *data)
igt_output_override_mode(output, mode_hi);
i++;
}
- igt_require(i915_pipe_output_combo_valid(display));
+ igt_require(intel_pipe_output_combo_valid(display));
igt_display_reset(display);
igt_create_pattern_fb(data->drm_fd, width, height, DRM_FORMAT_XRGB8888,
@@ -352,7 +352,7 @@ static void run_cdclk_test(data_t *data, uint32_t flags)
for_each_pipe_with_valid_output(display, pipe, output) {
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display)) {
+ if (!intel_pipe_output_combo_valid(display)) {
igt_output_set_pipe(output, PIPE_NONE);
continue;
}
diff --git a/tests/i915/kms_draw_crc.c b/tests/i915/kms_draw_crc.c
index db6d71f2e..3f78bac8b 100644
--- a/tests/i915/kms_draw_crc.c
+++ b/tests/i915/kms_draw_crc.c
@@ -63,7 +63,7 @@ static void find_modeset_params(void)
igt_display_reset(&display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(&display))
+ if (!intel_pipe_output_combo_valid(&display))
continue;
mode = igt_output_get_mode(output);
diff --git a/tests/i915/kms_dsc.c b/tests/i915/kms_dsc.c
index 3ce28f848..5846159f7 100644
--- a/tests/i915/kms_dsc.c
+++ b/tests/i915/kms_dsc.c
@@ -156,7 +156,7 @@ static void update_display(data_t *data, enum dsc_test_type test_type)
igt_output_override_mode(output, mode);
- if (!i915_pipe_output_combo_valid(display)) {
+ if (!intel_pipe_output_combo_valid(display)) {
if (data->output_format == DSC_FORMAT_RGB) {
igt_info("No valid pipe/output/mode found.\n");
diff --git a/tests/i915/kms_fence_pin_leak.c b/tests/i915/kms_fence_pin_leak.c
index 63657a742..6b678668e 100644
--- a/tests/i915/kms_fence_pin_leak.c
+++ b/tests/i915/kms_fence_pin_leak.c
@@ -202,7 +202,7 @@ static void run_test(data_t *data)
igt_display_reset(display);
igt_output_set_pipe(output, p);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
run_single_test(data, p, output);
diff --git a/tests/i915/kms_flip_scaled_crc.c b/tests/i915/kms_flip_scaled_crc.c
index f5dc430e3..987f5f54a 100644
--- a/tests/i915/kms_flip_scaled_crc.c
+++ b/tests/i915/kms_flip_scaled_crc.c
@@ -660,7 +660,7 @@ igt_main
igt_output_set_pipe(output, pipe);
igt_output_override_mode(output, modetoset);
- if (modetoset && i915_pipe_output_combo_valid(&data.display)) {
+ if (modetoset && intel_pipe_output_combo_valid(&data.display)) {
found = true;
igt_dynamic_f("pipe-%s-valid-mode", kmstest_pipe_name(pipe))
run_tests(&data, index, pipe, output, modetoset);
@@ -672,7 +672,7 @@ igt_main
igt_display_reset(&data.display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(&data.display))
+ if (!intel_pipe_output_combo_valid(&data.display))
continue;
modetoset = NULL;
diff --git a/tests/i915/kms_flip_tiling.c b/tests/i915/kms_flip_tiling.c
index a22f12382..01c27efef 100644
--- a/tests/i915/kms_flip_tiling.c
+++ b/tests/i915/kms_flip_tiling.c
@@ -199,7 +199,7 @@ igt_main
pipe_crc_free(&data);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(&data.display))
+ if (!intel_pipe_output_combo_valid(&data.display))
continue;
plane = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
diff --git a/tests/i915/kms_frontbuffer_tracking.c b/tests/i915/kms_frontbuffer_tracking.c
index 650e14a77..c7af27be4 100644
--- a/tests/i915/kms_frontbuffer_tracking.c
+++ b/tests/i915/kms_frontbuffer_tracking.c
@@ -415,7 +415,7 @@ static bool find_connector(bool edp_only, bool pipe_a,
igt_output_set_pipe(output, pipe);
igt_output_override_mode(output, connector_get_mode(output));
- if (i915_pipe_output_combo_valid(&drm.display)) {
+ if (intel_pipe_output_combo_valid(&drm.display)) {
*ret_output = output;
*ret_pipe = pipe;
return true;
diff --git a/tests/i915/kms_mmap_write_crc.c b/tests/i915/kms_mmap_write_crc.c
index bc51975f6..5f7750041 100644
--- a/tests/i915/kms_mmap_write_crc.c
+++ b/tests/i915/kms_mmap_write_crc.c
@@ -280,7 +280,7 @@ igt_main_args("n", NULL, NULL, opt_handler, NULL)
igt_display_reset(&data.display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(&data.display))
+ if (!intel_pipe_output_combo_valid(&data.display))
continue;
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe),
diff --git a/tests/i915/kms_psr.c b/tests/i915/kms_psr.c
index 6c89de45d..ec8cb8fe2 100644
--- a/tests/i915/kms_psr.c
+++ b/tests/i915/kms_psr.c
@@ -110,7 +110,7 @@ static void setup_output(data_t *data)
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
data->crtc_id = output->config.crtc->crtc_id;
diff --git a/tests/i915/kms_psr2_sf.c b/tests/i915/kms_psr2_sf.c
index 4cf986440..d55b818ef 100644
--- a/tests/i915/kms_psr2_sf.c
+++ b/tests/i915/kms_psr2_sf.c
@@ -879,7 +879,7 @@ pipe_output_combo_valid(igt_display_t *display,
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
ret = false;
igt_output_set_pipe(output, PIPE_NONE);
diff --git a/tests/i915/kms_psr2_su.c b/tests/i915/kms_psr2_su.c
index 65e67b8c9..43fed4241 100644
--- a/tests/i915/kms_psr2_su.c
+++ b/tests/i915/kms_psr2_su.c
@@ -106,7 +106,7 @@ static void setup_output(data_t *data)
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
data->output = output;
diff --git a/tests/i915/kms_psr_stress_test.c b/tests/i915/kms_psr_stress_test.c
index a4cb3194e..0812bcdd1 100644
--- a/tests/i915/kms_psr_stress_test.c
+++ b/tests/i915/kms_psr_stress_test.c
@@ -74,7 +74,7 @@ static void setup_output(data_t *data)
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display)) {
+ if (!intel_pipe_output_combo_valid(display)) {
igt_output_set_pipe(output, PIPE_NONE);
continue;
}
diff --git a/tests/i915/kms_pwrite_crc.c b/tests/i915/kms_pwrite_crc.c
index 3278d876d..e8481b545 100644
--- a/tests/i915/kms_pwrite_crc.c
+++ b/tests/i915/kms_pwrite_crc.c
@@ -162,7 +162,7 @@ static void run_test(data_t *data)
igt_display_reset(display);
igt_output_set_pipe(data->output, data->pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
prepare_crtc(data);
diff --git a/tests/kms_async_flips.c b/tests/kms_async_flips.c
index 51ffa523a..1b13b04dd 100644
--- a/tests/kms_async_flips.c
+++ b/tests/kms_async_flips.c
@@ -554,7 +554,7 @@ static void run_test(data_t *data, void (*test)(data_t *))
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), output->name) {
diff --git a/tests/kms_atomic.c b/tests/kms_atomic.c
index 037db2d36..c2232bacb 100644
--- a/tests/kms_atomic.c
+++ b/tests/kms_atomic.c
@@ -1312,7 +1312,7 @@ igt_main
igt_display_reset(&display);
igt_output_set_pipe(output, pipe);
- if (i915_pipe_output_combo_valid(&display)) {
+ if (intel_pipe_output_combo_valid(&display)) {
valid_config = true;
break;
}
diff --git a/tests/kms_atomic_interruptible.c b/tests/kms_atomic_interruptible.c
index 74b2e246a..a21830f26 100644
--- a/tests/kms_atomic_interruptible.c
+++ b/tests/kms_atomic_interruptible.c
@@ -277,7 +277,7 @@ static bool pipe_output_combo_valid(igt_display_t *display,
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
ret = false;
igt_output_set_pipe(output, PIPE_NONE);
diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c
index 9f39d033d..cd6df6cf2 100644
--- a/tests/kms_atomic_transition.c
+++ b/tests/kms_atomic_transition.c
@@ -767,7 +767,7 @@ static unsigned set_combinations(data_t *data, unsigned mask, struct igt_fb *fb)
continue;
igt_output_set_pipe(output, pipe);
- if (i915_pipe_output_combo_valid(&data->display)) {
+ if (intel_pipe_output_combo_valid(&data->display)) {
mode = igt_output_get_mode(output);
break;
} else {
@@ -857,7 +857,7 @@ retry:
continue;
igt_output_set_pipe(output, i);
- if (i915_pipe_output_combo_valid(&data->display)) {
+ if (intel_pipe_output_combo_valid(&data->display)) {
mode = igt_output_get_mode(output);
igt_info("(pipe %s + %s), mode:",
@@ -1013,7 +1013,7 @@ static bool pipe_output_combo_valid(igt_display_t *display,
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
ret = false;
igt_output_set_pipe(output, PIPE_NONE);
diff --git a/tests/kms_color_helper.c b/tests/kms_color_helper.c
index b01c38ef6..c756b280e 100644
--- a/tests/kms_color_helper.c
+++ b/tests/kms_color_helper.c
@@ -29,7 +29,7 @@ bool pipe_output_combo_valid(data_t *data, enum pipe pipe)
bool ret = true;
igt_output_set_pipe(data->output, pipe);
- if (!i915_pipe_output_combo_valid(&data->display))
+ if (!intel_pipe_output_combo_valid(&data->display))
ret = false;
igt_output_set_pipe(data->output, PIPE_NONE);
diff --git a/tests/kms_concurrent.c b/tests/kms_concurrent.c
index e1e581723..1ba2d11be 100644
--- a/tests/kms_concurrent.c
+++ b/tests/kms_concurrent.c
@@ -334,7 +334,7 @@ run_tests_for_pipe(data_t *data, enum pipe pipe)
igt_display_reset(&data->display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(&data->display))
+ if (!intel_pipe_output_combo_valid(&data->display))
continue;
igt_output_set_pipe(output, PIPE_NONE);
diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
index 344cac505..0b12d9c2f 100644
--- a/tests/kms_content_protection.c
+++ b/tests/kms_content_protection.c
@@ -509,7 +509,7 @@ test_content_protection(enum igt_commit_style s, int content_type)
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
modeset_with_fb(pipe, output, s);
diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c
index 3a353a032..8e7f32aee 100644
--- a/tests/kms_cursor_crc.c
+++ b/tests/kms_cursor_crc.c
@@ -713,7 +713,7 @@ static bool valid_pipe_output_combo(data_t *data)
igt_display_reset(display);
igt_output_set_pipe(data->output, data->pipe);
- if (i915_pipe_output_combo_valid(display))
+ if (intel_pipe_output_combo_valid(display))
ret = true;
igt_output_set_pipe(data->output, PIPE_NONE);
diff --git a/tests/kms_cursor_edge_walk.c b/tests/kms_cursor_edge_walk.c
index 5f423a18f..e4323b18d 100644
--- a/tests/kms_cursor_edge_walk.c
+++ b/tests/kms_cursor_edge_walk.c
@@ -375,7 +375,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data)
igt_display_reset(&data.display);
igt_output_set_pipe(data.output, data.pipe);
- if (!i915_pipe_output_combo_valid(&data.display))
+ if (!intel_pipe_output_combo_valid(&data.display))
continue;
igt_output_set_pipe(data.output, PIPE_NONE);
diff --git a/tests/kms_cursor_legacy.c b/tests/kms_cursor_legacy.c
index f7a6202cf..2d74861d0 100644
--- a/tests/kms_cursor_legacy.c
+++ b/tests/kms_cursor_legacy.c
@@ -252,7 +252,7 @@ find_connected_pipe(igt_display_t *display, bool second, igt_output_t **output)
continue;
igt_output_set_pipe(*output, pipe);
- if (i915_pipe_output_combo_valid(display)) {
+ if (intel_pipe_output_combo_valid(display)) {
found = true;
if (second) {
diff --git a/tests/kms_display_modes.c b/tests/kms_display_modes.c
index d69c7b931..9fbea228b 100644
--- a/tests/kms_display_modes.c
+++ b/tests/kms_display_modes.c
@@ -156,7 +156,7 @@ static void run_extendedmode_test(data_t *data) {
igt_output_set_pipe(output1, pipe1);
igt_output_set_pipe(output2, pipe2);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
igt_dynamic_f("pipe-%s-%s-pipe-%s-%s",
diff --git a/tests/kms_dp_tiled_display.c b/tests/kms_dp_tiled_display.c
index 07b803a50..77d5352ac 100644
--- a/tests/kms_dp_tiled_display.c
+++ b/tests/kms_dp_tiled_display.c
@@ -272,7 +272,7 @@ static void setup_mode(data_t *data)
igt_require(found);
igt_output_override_mode(output, mode);
}
- igt_require(i915_pipe_output_combo_valid(data->display));
+ igt_require(intel_pipe_output_combo_valid(data->display));
igt_display_commit_atomic(data->display, DRM_MODE_ATOMIC_ALLOW_MODESET,
NULL);
}
diff --git a/tests/kms_flip_event_leak.c b/tests/kms_flip_event_leak.c
index b79cd5030..84a83b544 100644
--- a/tests/kms_flip_event_leak.c
+++ b/tests/kms_flip_event_leak.c
@@ -110,7 +110,7 @@ igt_main
igt_display_reset(&data.display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(&data.display))
+ if (!intel_pipe_output_combo_valid(&data.display))
continue;
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) {
diff --git a/tests/kms_invalid_mode.c b/tests/kms_invalid_mode.c
index ec0483055..271408ba1 100644
--- a/tests/kms_invalid_mode.c
+++ b/tests/kms_invalid_mode.c
@@ -283,7 +283,7 @@ igt_main
igt_display_reset(&data.display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(&data.display))
+ if (!intel_pipe_output_combo_valid(&data.display))
continue;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe)) {
diff --git a/tests/kms_lease.c b/tests/kms_lease.c
index 29a774ae8..52080f11f 100644
--- a/tests/kms_lease.c
+++ b/tests/kms_lease.c
@@ -1227,7 +1227,7 @@ igt_main
igt_display_reset(display);
igt_output_set_pipe(output, data.pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(data.pipe),
diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c
index 84c73fd7f..ece943c52 100644
--- a/tests/kms_pipe_crc_basic.c
+++ b/tests/kms_pipe_crc_basic.c
@@ -353,7 +353,7 @@ static bool pipe_output_combo_valid(igt_display_t *display,
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
ret = false;
igt_output_set_pipe(output, PIPE_NONE);
diff --git a/tests/kms_plane.c b/tests/kms_plane.c
index 10e16b638..3aa3bf6cb 100644
--- a/tests/kms_plane.c
+++ b/tests/kms_plane.c
@@ -1206,7 +1206,7 @@ static void run_test(data_t *data, void (*test)(data_t *, enum pipe))
igt_display_reset(&data->display);
igt_output_set_pipe(data->output, pipe);
- if (!i915_pipe_output_combo_valid(&data->display))
+ if (!intel_pipe_output_combo_valid(&data->display))
continue;
igt_output_set_pipe(data->output, PIPE_NONE);
diff --git a/tests/kms_plane_alpha_blend.c b/tests/kms_plane_alpha_blend.c
index 0d03e178a..5444cd337 100644
--- a/tests/kms_plane_alpha_blend.c
+++ b/tests/kms_plane_alpha_blend.c
@@ -655,7 +655,7 @@ static void run_subtests(data_t *data)
igt_display_reset(&data->display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(&data->display))
+ if (!intel_pipe_output_combo_valid(&data->display))
continue;
prepare_crtc(data, output, pipe);
diff --git a/tests/kms_plane_cursor.c b/tests/kms_plane_cursor.c
index 59b105c60..11fe77387 100644
--- a/tests/kms_plane_cursor.c
+++ b/tests/kms_plane_cursor.c
@@ -86,7 +86,7 @@ static void test_init(data_t *data, enum pipe pipe_id, igt_output_t *output)
data->cursor = igt_pipe_get_plane_type(data->pipe, DRM_PLANE_TYPE_CURSOR);
igt_output_set_pipe(data->output, data->pipe_id);
- igt_require(i915_pipe_output_combo_valid(display));
+ igt_require(intel_pipe_output_combo_valid(display));
igt_info("Using (pipe %s + %s) to run the subtest.\n",
kmstest_pipe_name(data->pipe_id), igt_output_name(data->output));
diff --git a/tests/kms_plane_lowres.c b/tests/kms_plane_lowres.c
index db9f5a54c..2b1050413 100644
--- a/tests/kms_plane_lowres.c
+++ b/tests/kms_plane_lowres.c
@@ -280,7 +280,7 @@ static void run_test(data_t *data, uint64_t modifier)
igt_display_reset(&data->display);
igt_output_set_pipe(data->output, data->pipe);
- if (!i915_pipe_output_combo_valid(&data->display))
+ if (!intel_pipe_output_combo_valid(&data->display))
continue;
data->pipe_crc = igt_pipe_crc_new(data->drm_fd, data->pipe,
diff --git a/tests/kms_plane_multiple.c b/tests/kms_plane_multiple.c
index 7dd9d586d..4ef3be3e4 100644
--- a/tests/kms_plane_multiple.c
+++ b/tests/kms_plane_multiple.c
@@ -386,7 +386,7 @@ static void run_test(data_t *data, uint64_t modifier)
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), output->name)
diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c
index 0e7cd4a2a..09c2855c5 100644
--- a/tests/kms_plane_scaling.c
+++ b/tests/kms_plane_scaling.c
@@ -647,7 +647,7 @@ find_connected_pipe(igt_display_t *display, bool second, igt_output_t **output)
continue;
igt_output_set_pipe(*output, pipe);
- if (i915_pipe_output_combo_valid(display)) {
+ if (intel_pipe_output_combo_valid(display)) {
found = true;
if (second) {
@@ -1086,7 +1086,7 @@ pipe_output_combo_valid(igt_display_t *display,
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
ret = false;
igt_output_set_pipe(output, PIPE_NONE);
diff --git a/tests/kms_prime.c b/tests/kms_prime.c
index dd5ab993e..5f4d11993 100644
--- a/tests/kms_prime.c
+++ b/tests/kms_prime.c
@@ -92,7 +92,7 @@ static igt_output_t *setup_display(int importer_fd, igt_display_t *display,
igt_display_reset(display);
igt_output_set_pipe(output, *pipe);
- if (i915_pipe_output_combo_valid(display)) {
+ if (intel_pipe_output_combo_valid(display)) {
found = true;
break;
}
diff --git a/tests/kms_properties.c b/tests/kms_properties.c
index 2fe8dfa66..3f66f364b 100644
--- a/tests/kms_properties.c
+++ b/tests/kms_properties.c
@@ -244,7 +244,7 @@ static void plane_properties(igt_display_t *display, bool atomic)
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
found_any = found = true;
@@ -273,7 +273,7 @@ static void crtc_properties(igt_display_t *display, bool atomic)
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
found_any_valid_pipe = found = true;
@@ -305,7 +305,7 @@ static void connector_properties(igt_display_t *display, bool atomic)
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
found = true;
diff --git a/tests/kms_rmfb.c b/tests/kms_rmfb.c
index 50df42953..0e10a536c 100644
--- a/tests/kms_rmfb.c
+++ b/tests/kms_rmfb.c
@@ -161,7 +161,7 @@ run_rmfb_test(struct rmfb_data *data, bool reopen)
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe),
diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c
index 28b4fd27c..8169b165d 100644
--- a/tests/kms_rotation_crc.c
+++ b/tests/kms_rotation_crc.c
@@ -215,7 +215,7 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe,
cleanup_crtc(data);
igt_output_set_pipe(output, pipe);
- igt_require(i915_pipe_output_combo_valid(display));
+ igt_require(intel_pipe_output_combo_valid(display));
igt_plane_set_rotation(plane, IGT_ROTATION_0);
@@ -502,7 +502,7 @@ static void test_plane_rotation(data_t *data, int plane_type, bool test_bad_form
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
found = true;
@@ -824,7 +824,7 @@ static void test_multi_plane_rotation(data_t *data, enum pipe pipe)
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
found = true;
diff --git a/tests/kms_scaling_modes.c b/tests/kms_scaling_modes.c
index 906ae76de..50fb53109 100644
--- a/tests/kms_scaling_modes.c
+++ b/tests/kms_scaling_modes.c
@@ -99,7 +99,7 @@ static void test_scaling_mode(data_t *data, uint32_t flags)
continue;
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
igt_dynamic_f("%s-pipe-%s", output->name, kmstest_pipe_name(pipe))
diff --git a/tests/kms_sequence.c b/tests/kms_sequence.c
index c8a3d6bbd..c1ae8d1f4 100644
--- a/tests/kms_sequence.c
+++ b/tests/kms_sequence.c
@@ -288,7 +288,7 @@ igt_main
igt_display_reset(&data.display);
igt_output_set_pipe(output, p);
- if (!i915_pipe_output_combo_valid(&data.display))
+ if (!intel_pipe_output_combo_valid(&data.display))
continue;
igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(p)) {
diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
index 635a136ab..d45a57af5 100644
--- a/tests/kms_universal_plane.c
+++ b/tests/kms_universal_plane.c
@@ -793,7 +793,7 @@ pipe_output_combo_valid(igt_display_t *display,
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
ret = false;
igt_output_set_pipe(output, PIPE_NONE);
diff --git a/tests/kms_vblank.c b/tests/kms_vblank.c
index da0ada78e..09814b8ea 100644
--- a/tests/kms_vblank.c
+++ b/tests/kms_vblank.c
@@ -183,7 +183,7 @@ pipe_output_combo_valid(igt_display_t *display,
igt_display_reset(display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
ret = false;
igt_output_set_pipe(output, PIPE_NONE);
@@ -206,7 +206,7 @@ static void crtc_id_subtest(data_t *data, int fd)
igt_display_reset(display);
igt_output_set_pipe(output, p);
- if (!i915_pipe_output_combo_valid(display))
+ if (!intel_pipe_output_combo_valid(display))
continue;
igt_info("Using (pipe %s + %s) to run the subtest.\n",
@@ -532,7 +532,7 @@ static void invalid_subtest(data_t *data, int fd)
data->output = output;
igt_output_set_pipe(output, pipe);
- igt_require(i915_pipe_output_combo_valid(display));
+ igt_require(intel_pipe_output_combo_valid(display));
igt_info("Using (pipe %s + %s) to run the subtest.\n",
kmstest_pipe_name(pipe), igt_output_name(output));
diff --git a/tests/kms_vrr.c b/tests/kms_vrr.c
index d2d79c4eb..cd136593c 100644
--- a/tests/kms_vrr.c
+++ b/tests/kms_vrr.c
@@ -477,7 +477,7 @@ run_vrr_test(data_t *data, test_t test, uint32_t flags)
igt_display_reset(&data->display);
igt_output_set_pipe(output, pipe);
- if (!i915_pipe_output_combo_valid(&data->display))
+ if (!intel_pipe_output_combo_valid(&data->display))
continue;
igt_dynamic_f("pipe-%s-%s",
--
2.40.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-05-16 17:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-04 11:51 [igt-dev] [i-g-t] tests: s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/ Bhanuprakash Modem
2023-05-04 14:38 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2023-05-04 18:06 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2023-05-16 13:05 ` [igt-dev] [i-g-t] " Sharma, Swati2
-- strict thread matches above, loose matches on Subject: below --
2023-05-16 16:55 Bhanuprakash Modem
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox