From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id C0C3F10E3DF for ; Thu, 29 Jun 2023 15:09:51 +0000 (UTC) From: Bhanuprakash Modem To: igt-dev@lists.freedesktop.org Date: Thu, 29 Jun 2023 20:33:20 +0530 Message-Id: <20230629150324.3079878-2-bhanuprakash.modem@intel.com> In-Reply-To: <20230629150324.3079878-1-bhanuprakash.modem@intel.com> References: <20230629150324.3079878-1-bhanuprakash.modem@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [V5 i-g-t 1/5] tests: s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/ List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: 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, V3: - Rebase Signed-off-by: Bhanuprakash Modem Reviewed-by: Swati Sharma --- 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_fb_coherency.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 | 4 ++-- 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_tiled_display.c | 2 +- tests/kms_universal_plane.c | 2 +- tests/kms_vblank.c | 6 +++--- tests/kms_vrr.c | 2 +- 50 files changed, 63 insertions(+), 63 deletions(-) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index f2b0eed57..23cfccff8 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -5987,7 +5987,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 @@ -6005,7 +6005,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 44ea117a1..d998f5643 100644 --- a/tests/i915/kms_big_fb.c +++ b/tests/i915/kms_big_fb.c @@ -611,7 +611,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 ecc7f02d9..0ec771b11 100644 --- a/tests/i915/kms_busy.c +++ b/tests/i915/kms_busy.c @@ -318,7 +318,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 f04552dd7..a11588e29 100644 --- a/tests/i915/kms_ccs.c +++ b/tests/i915/kms_ccs.c @@ -600,7 +600,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 40eca24f0..ac81c409a 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 01ecb7bb9..e6ca1bddc 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 0a3e29924..008cca9da 100644 --- a/tests/i915/kms_dsc.c +++ b/tests/i915/kms_dsc.c @@ -157,7 +157,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_fb_coherency.c b/tests/i915/kms_fb_coherency.c index edb5ba460..4254908f9 100644 --- a/tests/i915/kms_fb_coherency.c +++ b/tests/i915/kms_fb_coherency.c @@ -213,7 +213,7 @@ static void select_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)) return; } diff --git a/tests/i915/kms_fence_pin_leak.c b/tests/i915/kms_fence_pin_leak.c index 3d63acfef..b231b7843 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 30da1fcf3..12ea4a6da 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 02a5fe8e3..2577efb38 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 b2183b08e..432a4e651 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 5a9eeec48..3dc1419fb 100644 --- a/tests/i915/kms_mmap_write_crc.c +++ b/tests/i915/kms_mmap_write_crc.c @@ -283,7 +283,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 3f8f83b42..018cc2956 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 b4734e5f1..403b13d24 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 3081887ca..74db059c5 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 23dcb4077..53aee82c6 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 7bddeecba..fa23cadd0 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 0a1199158..848c0ddd8 100644 --- a/tests/kms_async_flips.c +++ b/tests/kms_async_flips.c @@ -558,7 +558,7 @@ static void run_test(data_t *data, void (*test)(data_t *)) 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; test_init(data); diff --git a/tests/kms_atomic.c b/tests/kms_atomic.c index b65045abc..bf3b377c6 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 2acdcb29d..d9ca859a0 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 6ab5267ca..e079ed1c6 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 69cf2362e..143dff43e 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 d915a98b2..64395e08b 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 6cdf81a28..03bf13c47 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 0506fd6f1..98bbf8542 100644 --- a/tests/kms_cursor_crc.c +++ b/tests/kms_cursor_crc.c @@ -715,7 +715,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 462b51e20..24ae94942 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 06dea27d6..09a79f9a0 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 93d91ef5b..903a8409e 100644 --- a/tests/kms_display_modes.c +++ b/tests/kms_display_modes.c @@ -253,7 +253,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", @@ -307,7 +307,7 @@ static void run_extendedmode_negative(data_t *data, int pipe1, int pipe2) igt_output_override_mode(data->mst_output[0], &data->mode_mst[0]); igt_output_override_mode(data->mst_output[1], &data->mode_mst[1]); - igt_require(i915_pipe_output_combo_valid(display)); + igt_require(intel_pipe_output_combo_valid(display)); ret = igt_display_try_commit2(display, COMMIT_ATOMIC); igt_assert(ret != 0 && errno == ENOSPC); } diff --git a/tests/kms_flip_event_leak.c b/tests/kms_flip_event_leak.c index 423ce40df..345e3a700 100644 --- a/tests/kms_flip_event_leak.c +++ b/tests/kms_flip_event_leak.c @@ -106,7 +106,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 c26f8befe..d1ec092db 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 c8ae98206..9866ef75a 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 95cc1d7fa..84acb9a12 100644 --- a/tests/kms_pipe_crc_basic.c +++ b/tests/kms_pipe_crc_basic.c @@ -359,7 +359,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 67cff61d6..6ab2da12d 100644 --- a/tests/kms_plane.c +++ b/tests/kms_plane.c @@ -1224,7 +1224,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 341b85c7e..8fa3038f7 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 a7acb18e1..315c3ddb7 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 7aaf83c41..561c5213a 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 1f2bd65c3..899ebf83c 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 920290e4d..93f7252eb 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 52f587961..4a11d2480 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 8645808d1..4fd509651 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 9a41c1d14..905ae4dd9 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 5ad04407d..0c9e250ba 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; @@ -837,7 +837,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 31b806ae2..1a48ff333 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 1b96f0017..48403e835 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_tiled_display.c b/tests/kms_tiled_display.c index eba1b2764..ef88d1b25 100644 --- a/tests/kms_tiled_display.c +++ b/tests/kms_tiled_display.c @@ -265,7 +265,7 @@ static void setup_mode(data_t *data) igt_output_override_mode(output, mode); data->linetime_us = mode_linetime_us(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_universal_plane.c b/tests/kms_universal_plane.c index 957d600f1..13eaaaa4b 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 1aa8c1083..8659bc7d7 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 6a766bfb9..f658c1dc0 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