* [igt-dev] [i-g-t 0/5] Fix Bigjoiner checks
@ 2023-05-17 5:24 Bhanuprakash Modem
2023-05-17 5:24 ` [igt-dev] [i-g-t 1/5] tests: s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/ Bhanuprakash Modem
` (6 more replies)
0 siblings, 7 replies; 9+ messages in thread
From: Bhanuprakash Modem @ 2023-05-17 5:24 UTC (permalink / raw)
To: igt-dev, ankit.k.nautiyal, swati2.sharma, karthik.b.s
Bigjoiner will come in the picture when the resolution > 5K or
clock > max dot-clock. Add a support to check the selected mode
clock is greater than the max dot-clock.
Bhanuprakash Modem (5):
tests: s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/
lib/igt_kms: s/is_i915_device/is_intel_device
tests/i915/kms_big_joiner: Fix Bigjoiner checks
tests/kms_flip: Fix Bigjoiner checks
tests/kms_setmode: Fix Bigjoiner checks
lib/igt_kms.c | 8 +-
lib/igt_kms.h | 2 +-
tests/i915/kms_big_fb.c | 2 +-
tests/i915/kms_big_joiner.c | 106 +++++++++++++++-----------
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.c | 18 +++--
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_setmode.c | 22 ++++--
tests/kms_universal_plane.c | 2 +-
tests/kms_vblank.c | 6 +-
tests/kms_vrr.c | 2 +-
52 files changed, 150 insertions(+), 122 deletions(-)
--
2.40.0
^ permalink raw reply [flat|nested] 9+ messages in thread
* [igt-dev] [i-g-t 1/5] tests: s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/
2023-05-17 5:24 [igt-dev] [i-g-t 0/5] Fix Bigjoiner checks Bhanuprakash Modem
@ 2023-05-17 5:24 ` Bhanuprakash Modem
2023-05-17 5:24 ` [igt-dev] [i-g-t 2/5] lib/igt_kms: s/is_i915_device/is_intel_device Bhanuprakash Modem
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Bhanuprakash Modem @ 2023-05-17 5:24 UTC (permalink / raw)
To: igt-dev, ankit.k.nautiyal, swati2.sharma, karthik.b.s
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] 9+ messages in thread
* [igt-dev] [i-g-t 2/5] lib/igt_kms: s/is_i915_device/is_intel_device
2023-05-17 5:24 [igt-dev] [i-g-t 0/5] Fix Bigjoiner checks Bhanuprakash Modem
2023-05-17 5:24 ` [igt-dev] [i-g-t 1/5] tests: s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/ Bhanuprakash Modem
@ 2023-05-17 5:24 ` Bhanuprakash Modem
2023-05-17 5:24 ` [igt-dev] [i-g-t 3/5] tests/i915/kms_big_joiner: Fix Bigjoiner checks Bhanuprakash Modem
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Bhanuprakash Modem @ 2023-05-17 5:24 UTC (permalink / raw)
To: igt-dev, ankit.k.nautiyal, swati2.sharma, karthik.b.s
As few helpers supports both i915 & xe, update the checks to
support both drivers.
s/is_i915_device/is_intel_device
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
lib/igt_kms.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index fcafcb66e..3dc3da560 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -5814,7 +5814,7 @@ bool igt_max_bpc_constraint(igt_display_t *display, enum pipe pipe,
for_each_connector_mode(output) {
igt_output_override_mode(output, &connector->modes[j__]);
- if (is_i915_device(display->drm_fd) &&
+ if (is_intel_device(display->drm_fd) &&
!igt_check_bigjoiner_support(display))
continue;
@@ -6016,7 +6016,7 @@ bool intel_pipe_output_combo_valid(igt_display_t *display)
int combo = 0;
igt_output_t *output;
- if (!is_i915_device(display->drm_fd))
+ if (!is_intel_device(display->drm_fd))
return true;
for_each_connected_output(display, output) {
--
2.40.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [igt-dev] [i-g-t 3/5] tests/i915/kms_big_joiner: Fix Bigjoiner checks
2023-05-17 5:24 [igt-dev] [i-g-t 0/5] Fix Bigjoiner checks Bhanuprakash Modem
2023-05-17 5:24 ` [igt-dev] [i-g-t 1/5] tests: s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/ Bhanuprakash Modem
2023-05-17 5:24 ` [igt-dev] [i-g-t 2/5] lib/igt_kms: s/is_i915_device/is_intel_device Bhanuprakash Modem
@ 2023-05-17 5:24 ` Bhanuprakash Modem
2023-05-17 5:24 ` [igt-dev] [i-g-t 4/5] tests/kms_flip: " Bhanuprakash Modem
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Bhanuprakash Modem @ 2023-05-17 5:24 UTC (permalink / raw)
To: igt-dev, ankit.k.nautiyal, swati2.sharma, karthik.b.s
Bigjoiner will come in the picture when the resolution > 5K or
clock > max dot-clock. Add a support to check the selected mode
clock is greater than the max dot-clock.
V2: - Handle both 5k & max dot clock cases
- Other minor cleanups
V3: - Fix the logic to avoid the retry
V4: - consistent naming for bigjoiner
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
tests/i915/kms_big_joiner.c | 106 +++++++++++++++++++++---------------
1 file changed, 61 insertions(+), 45 deletions(-)
diff --git a/tests/i915/kms_big_joiner.c b/tests/i915/kms_big_joiner.c
index b9dda58f6..1a4d9d8b5 100644
--- a/tests/i915/kms_big_joiner.c
+++ b/tests/i915/kms_big_joiner.c
@@ -26,10 +26,13 @@
#include "igt.h"
-#define MAX_HDISPLAY_PER_PIPE 5120
-
IGT_TEST_DESCRIPTION("Test big joiner");
+struct bigjoiner_output {
+ uint32_t output_id;
+ drmModeModeInfo mode;
+};
+
typedef struct {
int drm_fd;
igt_display_t display;
@@ -37,9 +40,11 @@ typedef struct {
int n_pipes;
enum pipe pipe1;
enum pipe pipe2;
- uint32_t big_joiner_output[2];
+ struct bigjoiner_output output[2];
} data_t;
+static int max_dotclock;
+
static void test_invalid_modeset(data_t *data)
{
igt_output_t *output;
@@ -83,7 +88,7 @@ static void test_invalid_modeset(data_t *data)
static void test_basic_modeset(data_t *data)
{
drmModeModeInfo *mode;
- igt_output_t *output, *big_joiner_output = NULL;
+ igt_output_t *output, *bigjoiner_output = NULL;
igt_display_t *display = &data->display;
igt_pipe_t *pipe;
igt_plane_t *plane;
@@ -91,18 +96,16 @@ static void test_basic_modeset(data_t *data)
igt_display_reset(display);
for_each_connected_output(display, output) {
- if (data->big_joiner_output[0] == output->id) {
- big_joiner_output = output;
+ if (data->output[0].output_id == output->id) {
+ bigjoiner_output = output;
break;
}
}
- igt_output_set_pipe(big_joiner_output, data->pipe1);
+ igt_output_set_pipe(bigjoiner_output, data->pipe1);
- igt_sort_connector_modes(big_joiner_output->config.connector,
- sort_drm_modes_by_res_dsc);
- mode = &big_joiner_output->config.connector->modes[0];
- igt_output_override_mode(big_joiner_output, mode);
+ mode = &data->output[0].mode;
+ igt_output_override_mode(bigjoiner_output, mode);
pipe = &display->pipes[data->pipe1];
plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
@@ -113,7 +116,7 @@ static void test_basic_modeset(data_t *data)
igt_display_commit2(display, COMMIT_ATOMIC);
- igt_output_set_pipe(big_joiner_output, PIPE_NONE);
+ igt_output_set_pipe(bigjoiner_output, PIPE_NONE);
igt_plane_set_fb(plane, NULL);
igt_display_commit2(display, COMMIT_ATOMIC);
}
@@ -121,7 +124,7 @@ static void test_basic_modeset(data_t *data)
static void test_dual_display(data_t *data)
{
drmModeModeInfo *mode;
- igt_output_t *output, *big_joiner_output[2];
+ igt_output_t *output, *bigjoiner_output[2];
igt_display_t *display = &data->display;
igt_pipe_t *pipe;
igt_plane_t *plane1, *plane2;
@@ -130,8 +133,8 @@ static void test_dual_display(data_t *data)
igt_display_reset(display);
for_each_connected_output(display, output) {
- if (data->big_joiner_output[count] == output->id) {
- big_joiner_output[count] = output;
+ if (data->output[count].output_id == output->id) {
+ bigjoiner_output[count] = output;
count++;
}
@@ -139,14 +142,12 @@ static void test_dual_display(data_t *data)
break;
}
- igt_output_set_pipe(big_joiner_output[0], data->pipe1);
- igt_output_set_pipe(big_joiner_output[1], data->pipe2);
+ igt_output_set_pipe(bigjoiner_output[0], data->pipe1);
+ igt_output_set_pipe(bigjoiner_output[1], data->pipe2);
/* Set up first big joiner output on Pipe A*/
- igt_sort_connector_modes(big_joiner_output[0]->config.connector,
- sort_drm_modes_by_res_dsc);
- mode = &big_joiner_output[0]->config.connector->modes[0];
- igt_output_override_mode(big_joiner_output[0], mode);
+ mode = &data->output[0].mode;
+ igt_output_override_mode(bigjoiner_output[0], mode);
pipe = &display->pipes[data->pipe1];
plane1 = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
@@ -156,10 +157,8 @@ static void test_dual_display(data_t *data)
igt_plane_set_size(plane1, mode->hdisplay, mode->vdisplay);
/* Set up second big joiner output on Pipe C*/
- igt_sort_connector_modes(big_joiner_output[1]->config.connector,
- sort_drm_modes_by_res_dsc);
- mode = &big_joiner_output[1]->config.connector->modes[0];
- igt_output_override_mode(big_joiner_output[1], mode);
+ mode = &data->output[1].mode;
+ igt_output_override_mode(bigjoiner_output[1], mode);
pipe = &display->pipes[data->pipe2];
plane2 = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
@@ -171,13 +170,23 @@ static void test_dual_display(data_t *data)
igt_display_commit2(display, COMMIT_ATOMIC);
/* Clean up */
- igt_output_set_pipe(big_joiner_output[0], PIPE_NONE);
- igt_output_set_pipe(big_joiner_output[1], PIPE_NONE);
+ igt_output_set_pipe(bigjoiner_output[0], PIPE_NONE);
+ igt_output_set_pipe(bigjoiner_output[1], PIPE_NONE);
igt_plane_set_fb(plane1, NULL);
igt_plane_set_fb(plane2, NULL);
igt_display_commit2(display, COMMIT_ATOMIC);
}
+static bool bigjoiner_mode_found(drmModeConnector *connector,
+ int (*sort_method)(const void *, const void*),
+ drmModeModeInfo *mode)
+{
+ igt_sort_connector_modes(connector, sort_method);
+ *mode = connector->modes[0];
+
+ return igt_bigjoiner_possible(mode, max_dotclock);
+}
+
igt_main
{
data_t data;
@@ -194,13 +203,24 @@ igt_main
igt_display_require(&data.display, data.drm_fd);
igt_require(data.display.is_atomic);
- for_each_connected_output(&data.display, output) {
- igt_sort_connector_modes(output->config.connector,
- sort_drm_modes_by_res_dsc);
+ max_dotclock = igt_get_max_dotclock(data.drm_fd);
- mode = &output->config.connector->modes[0];
- if (mode->hdisplay > MAX_HDISPLAY_PER_PIPE) {
- data.big_joiner_output[count++] = output->id;
+ for_each_connected_output(&data.display, output) {
+ bool found = false;
+ drmModeConnector *connector = output->config.connector;
+
+ /*
+ * Bigjoiner will come in to the picture when the
+ * resolution > 5K or clock > max-dot-clock.
+ */
+ found = (bigjoiner_mode_found(connector, sort_drm_modes_by_res_dsc, mode) ||
+ bigjoiner_mode_found(connector, sort_drm_modes_by_clk_dsc, mode)) ?
+ true : false;
+
+ if (found) {
+ data.output[count].output_id = output->id;
+ memcpy(&data.output[count].mode, mode, sizeof(drmModeModeInfo));
+ count++;
width = max(width, mode->hdisplay);
height = max(height, mode->vdisplay);
@@ -215,7 +235,7 @@ igt_main
j++;
}
- igt_require_f(count > 0, "No output with 5k+ mode found\n");
+ igt_require_f(count > 0, "No output with 5k+ mode (or) clock > max-dot-clock found\n");
igt_create_pattern_fb(data.drm_fd, width, height, DRM_FORMAT_XRGB8888,
DRM_FORMAT_MOD_LINEAR, &data.fb);
@@ -237,14 +257,12 @@ igt_main
igt_display_reset(&data.display);
for_each_connected_output(&data.display, output) {
- if (data.big_joiner_output[0] != output->id)
+ if (data.output[0].output_id != output->id)
continue;
- igt_sort_connector_modes(output->config.connector,
- sort_drm_modes_by_res_dsc);
-
+ mode = &data.output[0].mode;
igt_output_set_pipe(output, data.pipe1);
- igt_output_override_mode(output, &output->config.connector->modes[0]);
+ igt_output_override_mode(output, mode);
igt_dynamic_f("pipe-%s-%s",
kmstest_pipe_name(data.pipe1),
@@ -261,17 +279,15 @@ igt_main
igt_display_reset(&data.display);
for_each_connected_output(&data.display, output) {
- igt_sort_connector_modes(output->config.connector,
- sort_drm_modes_by_res_dsc);
-
- if (data.big_joiner_output[0] == output->id) {
+ if (data.output[0].output_id == output->id) {
first_output = output;
+ mode = &data.output[0].mode;
+
igt_output_set_pipe(output, data.pipe1);
- igt_output_override_mode(output, &output->config.connector->modes[0]);
+ igt_output_override_mode(output, mode);
} else if (second_output == NULL) {
second_output = output;
igt_output_set_pipe(output, data.pipe2);
- igt_output_override_mode(output, &output->config.connector->modes[0]);
break;
}
--
2.40.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [igt-dev] [i-g-t 4/5] tests/kms_flip: Fix Bigjoiner checks
2023-05-17 5:24 [igt-dev] [i-g-t 0/5] Fix Bigjoiner checks Bhanuprakash Modem
` (2 preceding siblings ...)
2023-05-17 5:24 ` [igt-dev] [i-g-t 3/5] tests/i915/kms_big_joiner: Fix Bigjoiner checks Bhanuprakash Modem
@ 2023-05-17 5:24 ` Bhanuprakash Modem
2023-05-17 5:24 ` [igt-dev] [i-g-t 5/5] tests/kms_setmode: " Bhanuprakash Modem
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Bhanuprakash Modem @ 2023-05-17 5:24 UTC (permalink / raw)
To: igt-dev, ankit.k.nautiyal, swati2.sharma, karthik.b.s
Bigjoiner will come in the picture when the resolution > 5K or
clock > max dot-clock. Add a support to check the selected mode
clock is greater than the max dot-clock.
V2: - Limit the bigjoiner checks to intel hardware
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
---
tests/kms_flip.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index f1e0700c1..3b181d4fa 100755
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -87,8 +87,6 @@
#define RUN_TEST 1
#define RUN_PAIR 2
-#define MAX_HDISPLAY_PER_CRTC 5120
-
#ifndef DRM_CAP_TIMESTAMP_MONOTONIC
#define DRM_CAP_TIMESTAMP_MONOTONIC 6
#endif
@@ -102,6 +100,7 @@ uint32_t devid;
int test_time = 3;
static bool monotonic_timestamp;
static pthread_t vblank_wait_thread;
+static int max_dotclock;
static drmModeConnector *last_connector;
@@ -1535,21 +1534,24 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
igt_assert_eq(o->count, crtc_count);
/*
- * Handle BW limitations:
+ * Handle BW limitations on intel hardware:
*
- * if mode.hdisplay > 5120, then ignore
+ * if mode resolution > 5K (or) mode clock > max_dotclock, then ignore
* - last crtc in single/multi-connector config
* - consecutive crtcs in multi-connector config
*
* in multi-connector config ignore if
- * - previous crtc mode.hdisplay > 5120 and
+ * - previous crtc (mode resolution > 5K or mode clock > max_dotclock) and
* - current & previous crtcs are consecutive
*/
+ if (!is_intel_device(drm_fd))
+ goto test;
+
for (i = 0; i < crtc_count; i++) {
- if (((o->kmode[i].hdisplay > MAX_HDISPLAY_PER_CRTC) &&
+ if ((igt_bigjoiner_possible(&o->kmode[i], max_dotclock) &&
((crtc_idxs[i] >= (total_crtcs - 1)) ||
((i < (crtc_count - 1)) && (abs(crtc_idxs[i + 1] - crtc_idxs[i]) <= 1)))) ||
- ((i > 0) && (o->kmode[i - 1].hdisplay > MAX_HDISPLAY_PER_CRTC) &&
+ ((i > 0) && igt_bigjoiner_possible(&o->kmode[i - 1], max_dotclock) &&
(abs(crtc_idxs[i] - crtc_idxs[i - 1]) <= 1))) {
igt_debug("Combo: %s is not possible with selected mode(s).\n", test_name);
@@ -1557,6 +1559,7 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
}
}
+test:
igt_dynamic_f("%s", test_name)
__run_test_on_crtc_set(o, crtc_idxs, crtc_count, duration_ms);
}
@@ -1870,6 +1873,7 @@ igt_main_args("e", NULL, help_str, opt_handler, NULL)
for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++)
tests[i].flags &= ~(TEST_CHECK_TS | TEST_VBLANK_EXPIRED_SEQ);
}
+ max_dotclock = igt_get_max_dotclock(drm_fd);
}
igt_describe("Tests that nonblocking reading fails correctly");
--
2.40.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [igt-dev] [i-g-t 5/5] tests/kms_setmode: Fix Bigjoiner checks
2023-05-17 5:24 [igt-dev] [i-g-t 0/5] Fix Bigjoiner checks Bhanuprakash Modem
` (3 preceding siblings ...)
2023-05-17 5:24 ` [igt-dev] [i-g-t 4/5] tests/kms_flip: " Bhanuprakash Modem
@ 2023-05-17 5:24 ` Bhanuprakash Modem
2023-05-17 6:18 ` [igt-dev] ✓ Fi.CI.BAT: success for Fix Bigjoiner checks (rev7) Patchwork
2023-05-17 15:25 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
6 siblings, 0 replies; 9+ messages in thread
From: Bhanuprakash Modem @ 2023-05-17 5:24 UTC (permalink / raw)
To: igt-dev, ankit.k.nautiyal, swati2.sharma, karthik.b.s
Bigjoiner will come in the picture when the resolution > 5K or
clock > max dot-clock. Add a support to check the selected mode
clock is greater than the max dot-clock.
V2: - Limit the bigjoiner checks to intel hardware
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
tests/kms_setmode.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c
index a611d9382..193096537 100644
--- a/tests/kms_setmode.c
+++ b/tests/kms_setmode.c
@@ -41,13 +41,12 @@
/* restricted pipe count */
#define CRTC_RESTRICT_CNT 2
-#define MAX_HDISPLAY_PER_CRTC 5120
-
static int drm_fd;
static drmModeRes *drm_resources;
static int filter_test_id;
static bool dry_run;
static bool extended = false;
+static int max_dotclock;
const drmModeModeInfo mode_640_480 = {
.name = "640x480",
@@ -661,28 +660,35 @@ static void test_one_combination(const struct test_config *tconf,
pos += get_test_name_str(&crtcs[i], &test_name[pos], ARRAY_SIZE(test_name) - pos);
}
+ if (!is_intel_device(drm_fd))
+ goto test;
+
for (i = 0; i < crtc_count; i++) {
struct crtc_config *crtc = &crtcs[i];
/*
- * if mode.hdisplay > 5120, then ignore
+ * Handle BW limitations on intel hardware:
+ *
+ * if mode resolution > 5K (or) mode clock > max_dotclock,
+ * then ignore
* - last crtc in single/multi-connector config
* - consecutive crtcs in multi-connector config
*
* in multi-connector config ignore if
- * - previous crtc mode.hdisplay > 5120 and
+ * - previous crtc (mode resolution > 5K (or)
+ * mode clock > max_dotclock) and
* - current & previous crtcs are consecutive
*/
- if (((crtc->mode.hdisplay > MAX_HDISPLAY_PER_CRTC) &&
+ if ((igt_bigjoiner_possible(&crtc->mode, max_dotclock) &&
((crtc->crtc_idx >= (tconf->resources->count_crtcs - 1)) ||
((i < (crtc_count - 1)) && (abs(crtcs[i + 1].crtc_idx - crtc->crtc_idx) <= 1)))) ||
- ((i > 0) && (crtc[i - 1].mode.hdisplay > MAX_HDISPLAY_PER_CRTC) &&
+ ((i > 0) && igt_bigjoiner_possible(&crtc[i - 1].mode, max_dotclock) &&
(abs(crtc->crtc_idx - crtcs[i - 1].crtc_idx) <= 1))) {
igt_info("Combo: %s is not possible with selected mode(s).\n", test_name);
goto out;
}
}
-
+test:
igt_dynamic_f("%s", test_name)
test_crtc_config(tconf, crtcs, crtc_count);
}
@@ -958,6 +964,8 @@ igt_main_args("det:", NULL, help_str, opt_handler, NULL)
if (is_xe_device(drm_fd))
xe_device_get(drm_fd);
+
+ max_dotclock = igt_get_max_dotclock(drm_fd);
}
for (i = 0; i < ARRAY_SIZE(tests); i++) {
--
2.40.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for Fix Bigjoiner checks (rev7)
2023-05-17 5:24 [igt-dev] [i-g-t 0/5] Fix Bigjoiner checks Bhanuprakash Modem
` (4 preceding siblings ...)
2023-05-17 5:24 ` [igt-dev] [i-g-t 5/5] tests/kms_setmode: " Bhanuprakash Modem
@ 2023-05-17 6:18 ` Patchwork
2023-05-17 15:25 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
6 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2023-05-17 6:18 UTC (permalink / raw)
To: Bhanuprakash Modem; +Cc: igt-dev
[-- Attachment #1: Type: text/plain, Size: 9457 bytes --]
== Series Details ==
Series: Fix Bigjoiner checks (rev7)
URL : https://patchwork.freedesktop.org/series/115712/
State : success
== Summary ==
CI Bug Log - changes from IGT_7293 -> IGTPW_8981
====================================================
Summary
-------
**WARNING**
Minor unknown changes coming with IGTPW_8981 need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in IGTPW_8981, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/index.html
Participating hosts (36 -> 37)
------------------------------
Additional (2): fi-kbl-soraka bat-mtlp-6
Missing (1): fi-snb-2520m
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_8981:
### IGT changes ###
#### Warnings ####
* igt@kms_flip@basic-plain-flip:
- bat-atsm-1: [SKIP][1] ([i915#6166]) -> [FAIL][2] +3 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/bat-atsm-1/igt@kms_flip@basic-plain-flip.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/bat-atsm-1/igt@kms_flip@basic-plain-flip.html
Known issues
------------
Here are the changes found in IGTPW_8981 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_huc_copy@huc-copy:
- fi-kbl-soraka: NOTRUN -> [SKIP][3] ([fdo#109271] / [i915#2190])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/fi-kbl-soraka/igt@gem_huc_copy@huc-copy.html
* igt@gem_lmem_swapping@basic:
- fi-kbl-soraka: NOTRUN -> [SKIP][4] ([fdo#109271] / [i915#4613]) +3 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/fi-kbl-soraka/igt@gem_lmem_swapping@basic.html
* igt@i915_selftest@live@gt_pm:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][5] ([i915#1886] / [i915#7913])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html
* igt@i915_selftest@live@hangcheck:
- bat-dg2-11: [PASS][6] -> [ABORT][7] ([i915#7913] / [i915#7979])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/bat-dg2-11/igt@i915_selftest@live@hangcheck.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/bat-dg2-11/igt@i915_selftest@live@hangcheck.html
* igt@i915_selftest@live@migrate:
- bat-adlp-9: [PASS][8] -> [DMESG-FAIL][9] ([i915#7699] / [i915#7913])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/bat-adlp-9/igt@i915_selftest@live@migrate.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/bat-adlp-9/igt@i915_selftest@live@migrate.html
- bat-dg2-11: [PASS][10] -> [DMESG-WARN][11] ([i915#7699])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/bat-dg2-11/igt@i915_selftest@live@migrate.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/bat-dg2-11/igt@i915_selftest@live@migrate.html
- bat-rpls-2: [PASS][12] -> [DMESG-FAIL][13] ([i915#7699] / [i915#7913])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/bat-rpls-2/igt@i915_selftest@live@migrate.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/bat-rpls-2/igt@i915_selftest@live@migrate.html
* igt@i915_selftest@live@slpc:
- bat-rpls-2: NOTRUN -> [DMESG-WARN][14] ([i915#6367])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/bat-rpls-2/igt@i915_selftest@live@slpc.html
* igt@i915_suspend@basic-s2idle-without-i915:
- bat-rpls-2: NOTRUN -> [ABORT][15] ([i915#6687])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/bat-rpls-2/igt@i915_suspend@basic-s2idle-without-i915.html
* igt@kms_addfb_basic@invalid-set-prop:
- fi-cfl-8109u: [PASS][16] -> [DMESG-WARN][17] ([i915#62]) +74 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/fi-cfl-8109u/igt@kms_addfb_basic@invalid-set-prop.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/fi-cfl-8109u/igt@kms_addfb_basic@invalid-set-prop.html
* igt@kms_chamelium_frames@hdmi-crc-fast:
- fi-kbl-soraka: NOTRUN -> [SKIP][18] ([fdo#109271]) +14 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/fi-kbl-soraka/igt@kms_chamelium_frames@hdmi-crc-fast.html
* igt@kms_pipe_crc_basic@nonblocking-crc@pipe-c-dp-1:
- bat-dg2-8: [PASS][19] -> [FAIL][20] ([i915#7932])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc@pipe-c-dp-1.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc@pipe-c-dp-1.html
* igt@kms_pipe_crc_basic@read-crc:
- bat-adlp-9: NOTRUN -> [SKIP][21] ([i915#3546]) +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/bat-adlp-9/igt@kms_pipe_crc_basic@read-crc.html
* igt@kms_setmode@basic-clone-single-crtc:
- fi-kbl-soraka: NOTRUN -> [SKIP][22] ([fdo#109271] / [i915#4579])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/fi-kbl-soraka/igt@kms_setmode@basic-clone-single-crtc.html
#### Possible fixes ####
* igt@i915_selftest@live@migrate:
- bat-atsm-1: [DMESG-FAIL][23] ([i915#7699] / [i915#7913]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/bat-atsm-1/igt@i915_selftest@live@migrate.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/bat-atsm-1/igt@i915_selftest@live@migrate.html
* igt@i915_selftest@live@requests:
- {bat-mtlp-8}: [ABORT][25] ([i915#4983] / [i915#7920]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/bat-mtlp-8/igt@i915_selftest@live@requests.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/bat-mtlp-8/igt@i915_selftest@live@requests.html
* igt@i915_selftest@live@reset:
- bat-rpls-2: [ABORT][27] ([i915#4983] / [i915#7461] / [i915#7913] / [i915#8347]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/bat-rpls-2/igt@i915_selftest@live@reset.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/bat-rpls-2/igt@i915_selftest@live@reset.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#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3595]: https://gitlab.freedesktop.org/drm/intel/issues/3595
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4342]: https://gitlab.freedesktop.org/drm/intel/issues/4342
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5190]: https://gitlab.freedesktop.org/drm/intel/issues/5190
[i915#5274]: https://gitlab.freedesktop.org/drm/intel/issues/5274
[i915#6166]: https://gitlab.freedesktop.org/drm/intel/issues/6166
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#6645]: https://gitlab.freedesktop.org/drm/intel/issues/6645
[i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
[i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456
[i915#7461]: https://gitlab.freedesktop.org/drm/intel/issues/7461
[i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7920]: https://gitlab.freedesktop.org/drm/intel/issues/7920
[i915#7932]: https://gitlab.freedesktop.org/drm/intel/issues/7932
[i915#7979]: https://gitlab.freedesktop.org/drm/intel/issues/7979
[i915#8347]: https://gitlab.freedesktop.org/drm/intel/issues/8347
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_7293 -> IGTPW_8981
CI-20190529: 20190529
CI_DRM_13154: d04e82f5245c285e7ae36955d89c4d217d04d664 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_8981: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/index.html
IGT_7293: a19a081d1b8a8f902d7d8009a6ea6c471d5531ad @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/index.html
[-- Attachment #2: Type: text/html, Size: 9995 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [igt-dev] ✗ Fi.CI.IGT: failure for Fix Bigjoiner checks (rev7)
2023-05-17 5:24 [igt-dev] [i-g-t 0/5] Fix Bigjoiner checks Bhanuprakash Modem
` (5 preceding siblings ...)
2023-05-17 6:18 ` [igt-dev] ✓ Fi.CI.BAT: success for Fix Bigjoiner checks (rev7) Patchwork
@ 2023-05-17 15:25 ` Patchwork
6 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2023-05-17 15:25 UTC (permalink / raw)
To: Modem, Bhanuprakash; +Cc: igt-dev
[-- Attachment #1: Type: text/plain, Size: 16392 bytes --]
== Series Details ==
Series: Fix Bigjoiner checks (rev7)
URL : https://patchwork.freedesktop.org/series/115712/
State : failure
== Summary ==
CI Bug Log - changes from IGT_7293_full -> IGTPW_8981_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with IGTPW_8981_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in IGTPW_8981_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/index.html
Participating hosts (7 -> 7)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_8981_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_ctx_isolation@preservation-s3@vecs0:
- shard-apl: [PASS][1] -> [ABORT][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-apl3/igt@gem_ctx_isolation@preservation-s3@vecs0.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-apl2/igt@gem_ctx_isolation@preservation-s3@vecs0.html
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@kms_big_joiner@2x-modeset:
- {shard-rkl}: [SKIP][3] ([i915#2705]) -> [SKIP][4] +2 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-rkl-1/igt@kms_big_joiner@2x-modeset.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-rkl-6/igt@kms_big_joiner@2x-modeset.html
* igt@kms_big_joiner@invalid-modeset:
- {shard-dg1}: [SKIP][5] ([i915#2705]) -> [SKIP][6] +2 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-dg1-18/igt@kms_big_joiner@invalid-modeset.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-dg1-13/igt@kms_big_joiner@invalid-modeset.html
- {shard-tglu}: [SKIP][7] ([i915#2705]) -> [SKIP][8] +2 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-tglu-2/igt@kms_big_joiner@invalid-modeset.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-tglu-7/igt@kms_big_joiner@invalid-modeset.html
Known issues
------------
Here are the changes found in IGTPW_8981_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@drm_buddy@all-tests:
- shard-apl: NOTRUN -> [SKIP][9] ([fdo#109271] / [i915#4579])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-apl3/igt@drm_buddy@all-tests.html
* igt@gem_barrier_race@remote-request@rcs0:
- shard-apl: [PASS][10] -> [ABORT][11] ([i915#7461] / [i915#8211] / [i915#8234])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-apl2/igt@gem_barrier_race@remote-request@rcs0.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-apl7/igt@gem_barrier_race@remote-request@rcs0.html
* igt@gem_lmem_swapping@smem-oom:
- shard-apl: NOTRUN -> [SKIP][12] ([fdo#109271] / [i915#4613]) +1 similar issue
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-apl6/igt@gem_lmem_swapping@smem-oom.html
* igt@i915_pm_dc@dc9-dpms:
- shard-apl: [PASS][13] -> [SKIP][14] ([fdo#109271])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-apl1/igt@i915_pm_dc@dc9-dpms.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-apl3/igt@i915_pm_dc@dc9-dpms.html
* igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc:
- shard-apl: NOTRUN -> [SKIP][15] ([fdo#109271] / [i915#3886])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-apl7/igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_content_protection@type1:
- shard-snb: NOTRUN -> [SKIP][16] ([fdo#109271] / [i915#4579])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-snb7/igt@kms_content_protection@type1.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-apl: [PASS][17] -> [FAIL][18] ([i915#2346])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-apl3/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-apl1/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-cpu:
- shard-snb: [PASS][19] -> [SKIP][20] ([fdo#109271])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-snb5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-cpu.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-snb7/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-mmap-cpu.html
* igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-indfb-pgflip-blt:
- shard-snb: NOTRUN -> [SKIP][21] ([fdo#109271]) +8 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-snb6/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-indfb-pgflip-blt.html
* igt@kms_plane_alpha_blend@alpha-opaque-fb@pipe-a-dp-1:
- shard-apl: NOTRUN -> [FAIL][22] ([i915#4573]) +1 similar issue
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-apl2/igt@kms_plane_alpha_blend@alpha-opaque-fb@pipe-a-dp-1.html
* igt@perf@stress-open-close@0-rcs0:
- shard-glk: [PASS][23] -> [ABORT][24] ([i915#5213] / [i915#7941])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-glk2/igt@perf@stress-open-close@0-rcs0.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-glk5/igt@perf@stress-open-close@0-rcs0.html
* igt@v3d/v3d_perfmon@destroy-valid-perfmon:
- shard-apl: NOTRUN -> [SKIP][25] ([fdo#109271]) +43 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-apl2/igt@v3d/v3d_perfmon@destroy-valid-perfmon.html
#### Possible fixes ####
* igt@gem_ctx_exec@basic-nohangcheck:
- {shard-tglu}: [FAIL][26] ([i915#6268]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-tglu-7/igt@gem_ctx_exec@basic-nohangcheck.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-tglu-7/igt@gem_ctx_exec@basic-nohangcheck.html
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-apl: [FAIL][28] ([i915#2842]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-apl3/igt@gem_exec_fair@basic-none-solo@rcs0.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-apl2/igt@gem_exec_fair@basic-none-solo@rcs0.html
* igt@gem_exec_fair@basic-pace-share@rcs0:
- {shard-tglu}: [FAIL][30] ([i915#2842]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-tglu-5/igt@gem_exec_fair@basic-pace-share@rcs0.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-tglu-3/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@gem_exec_fair@basic-pace@vcs0:
- shard-glk: [FAIL][32] ([i915#2842]) -> [PASS][33] +2 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-glk2/igt@gem_exec_fair@basic-pace@vcs0.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-glk9/igt@gem_exec_fair@basic-pace@vcs0.html
* igt@i915_pm_rc6_residency@rc6-idle@vecs0:
- {shard-dg1}: [FAIL][34] ([i915#3591]) -> [PASS][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-dg1-12/igt@i915_pm_rc6_residency@rc6-idle@vecs0.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-dg1-18/igt@i915_pm_rc6_residency@rc6-idle@vecs0.html
* igt@i915_pm_rpm@modeset-lpsp:
- {shard-rkl}: [SKIP][36] ([i915#1397]) -> [PASS][37] +1 similar issue
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-rkl-3/igt@i915_pm_rpm@modeset-lpsp.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-rkl-7/igt@i915_pm_rpm@modeset-lpsp.html
* igt@i915_suspend@debugfs-reader:
- shard-apl: [ABORT][38] -> [PASS][39]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-apl1/igt@i915_suspend@debugfs-reader.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-apl2/igt@i915_suspend@debugfs-reader.html
* igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-async-flip:
- {shard-rkl}: [FAIL][40] ([i915#3743]) -> [PASS][41]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-rkl-7/igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-async-flip.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-rkl-3/igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-async-flip.html
* igt@kms_cursor_legacy@forked-move@pipe-b:
- {shard-rkl}: [INCOMPLETE][42] ([i915#8011]) -> [PASS][43]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-rkl-7/igt@kms_cursor_legacy@forked-move@pipe-b.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-rkl-2/igt@kms_cursor_legacy@forked-move@pipe-b.html
* igt@kms_flip@plain-flip-fb-recreate@b-vga1:
- shard-snb: [INCOMPLETE][44] -> [PASS][45]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-snb6/igt@kms_flip@plain-flip-fb-recreate@b-vga1.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-snb6/igt@kms_flip@plain-flip-fb-recreate@b-vga1.html
* igt@perf_pmu@idle@rcs0:
- {shard-rkl}: [FAIL][46] ([i915#4349]) -> [PASS][47]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-rkl-4/igt@perf_pmu@idle@rcs0.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-rkl-3/igt@perf_pmu@idle@rcs0.html
#### Warnings ####
* igt@kms_content_protection@mei_interface:
- shard-apl: [SKIP][48] ([fdo#109271] / [i915#4579]) -> [SKIP][49] ([fdo#109271])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-apl4/igt@kms_content_protection@mei_interface.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-apl4/igt@kms_content_protection@mei_interface.html
- shard-snb: [SKIP][50] ([fdo#109271] / [i915#4579]) -> [SKIP][51] ([fdo#109271])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-snb4/igt@kms_content_protection@mei_interface.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-snb4/igt@kms_content_protection@mei_interface.html
- shard-glk: [SKIP][52] ([fdo#109271] / [i915#4579]) -> [SKIP][53] ([fdo#109271])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_7293/shard-glk2/igt@kms_content_protection@mei_interface.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/shard-glk2/igt@kms_content_protection@mei_interface.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#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109300]: https://bugs.freedesktop.org/show_bug.cgi?id=109300
[fdo#109314]: https://bugs.freedesktop.org/show_bug.cgi?id=109314
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[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#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#3023]: https://gitlab.freedesktop.org/drm/intel/issues/3023
[i915#315]: https://gitlab.freedesktop.org/drm/intel/issues/315
[i915#3323]: https://gitlab.freedesktop.org/drm/intel/issues/3323
[i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3743]: https://gitlab.freedesktop.org/drm/intel/issues/3743
[i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[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#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
[i915#4387]: https://gitlab.freedesktop.org/drm/intel/issues/4387
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#4573]: https://gitlab.freedesktop.org/drm/intel/issues/4573
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4816]: https://gitlab.freedesktop.org/drm/intel/issues/4816
[i915#5099]: https://gitlab.freedesktop.org/drm/intel/issues/5099
[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#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#5723]: https://gitlab.freedesktop.org/drm/intel/issues/5723
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
[i915#7276]: https://gitlab.freedesktop.org/drm/intel/issues/7276
[i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456
[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#7941]: https://gitlab.freedesktop.org/drm/intel/issues/7941
[i915#7975]: https://gitlab.freedesktop.org/drm/intel/issues/7975
[i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011
[i915#8211]: https://gitlab.freedesktop.org/drm/intel/issues/8211
[i915#8213]: https://gitlab.freedesktop.org/drm/intel/issues/8213
[i915#8234]: https://gitlab.freedesktop.org/drm/intel/issues/8234
[i915#8381]: https://gitlab.freedesktop.org/drm/intel/issues/8381
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_7293 -> IGTPW_8981
CI-20190529: 20190529
CI_DRM_13154: d04e82f5245c285e7ae36955d89c4d217d04d664 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_8981: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/index.html
IGT_7293: a19a081d1b8a8f902d7d8009a6ea6c471d5531ad @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8981/index.html
[-- Attachment #2: Type: text/html, Size: 15743 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [igt-dev] [i-g-t 3/5] tests/i915/kms_big_joiner: Fix Bigjoiner checks
2023-11-13 8:19 [igt-dev] [i-g-t 0/5] Fix Bigjoiner checks Bhanuprakash Modem
@ 2023-11-13 8:19 ` Bhanuprakash Modem
0 siblings, 0 replies; 9+ messages in thread
From: Bhanuprakash Modem @ 2023-11-13 8:19 UTC (permalink / raw)
To: igt-dev; +Cc: Kunal Joshi
Bigjoiner will come in the picture when the resolution > 5K or
clock > max dot-clock. Add a support to check the selected mode
clock is greater than the max dot-clock.
V2: - Handle both 5k & max dot clock cases
- Other minor cleanups
V3: - Fix the logic to avoid the retry
V4: - consistent naming for bigjoiner
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
Reviewed-by: Kunal Joshi <kunal1.joshi@intel.com>
---
tests/intel/kms_big_joiner.c | 106 ++++++++++++++++++++---------------
1 file changed, 61 insertions(+), 45 deletions(-)
diff --git a/tests/intel/kms_big_joiner.c b/tests/intel/kms_big_joiner.c
index a555ca799..2f81204f5 100644
--- a/tests/intel/kms_big_joiner.c
+++ b/tests/intel/kms_big_joiner.c
@@ -31,10 +31,13 @@
*/
#include "igt.h"
-#define MAX_HDISPLAY_PER_PIPE 5120
-
IGT_TEST_DESCRIPTION("Test big joiner");
+struct bigjoiner_output {
+ uint32_t output_id;
+ drmModeModeInfo mode;
+};
+
typedef struct {
int drm_fd;
igt_display_t display;
@@ -42,9 +45,11 @@ typedef struct {
int n_pipes;
enum pipe pipe1;
enum pipe pipe2;
- uint32_t big_joiner_output[2];
+ struct bigjoiner_output output[2];
} data_t;
+static int max_dotclock;
+
/**
* SUBTEST: invalid-modeset
* Description: Verify if the modeset on the adjoining pipe is rejected when
@@ -105,7 +110,7 @@ static void test_invalid_modeset(data_t *data)
static void test_basic_modeset(data_t *data)
{
drmModeModeInfo *mode;
- igt_output_t *output, *big_joiner_output = NULL;
+ igt_output_t *output, *bigjoiner_output = NULL;
igt_display_t *display = &data->display;
igt_pipe_t *pipe;
igt_plane_t *plane;
@@ -113,18 +118,16 @@ static void test_basic_modeset(data_t *data)
igt_display_reset(display);
for_each_connected_output(display, output) {
- if (data->big_joiner_output[0] == output->id) {
- big_joiner_output = output;
+ if (data->output[0].output_id == output->id) {
+ bigjoiner_output = output;
break;
}
}
- igt_output_set_pipe(big_joiner_output, data->pipe1);
+ igt_output_set_pipe(bigjoiner_output, data->pipe1);
- igt_sort_connector_modes(big_joiner_output->config.connector,
- sort_drm_modes_by_res_dsc);
- mode = &big_joiner_output->config.connector->modes[0];
- igt_output_override_mode(big_joiner_output, mode);
+ mode = &data->output[0].mode;
+ igt_output_override_mode(bigjoiner_output, mode);
pipe = &display->pipes[data->pipe1];
plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
@@ -135,7 +138,7 @@ static void test_basic_modeset(data_t *data)
igt_display_commit2(display, COMMIT_ATOMIC);
- igt_output_set_pipe(big_joiner_output, PIPE_NONE);
+ igt_output_set_pipe(bigjoiner_output, PIPE_NONE);
igt_plane_set_fb(plane, NULL);
igt_display_commit2(display, COMMIT_ATOMIC);
}
@@ -151,7 +154,7 @@ static void test_basic_modeset(data_t *data)
static void test_dual_display(data_t *data)
{
drmModeModeInfo *mode;
- igt_output_t *output, *big_joiner_output[2];
+ igt_output_t *output, *bigjoiner_output[2];
igt_display_t *display = &data->display;
igt_pipe_t *pipe;
igt_plane_t *plane1, *plane2;
@@ -160,8 +163,8 @@ static void test_dual_display(data_t *data)
igt_display_reset(display);
for_each_connected_output(display, output) {
- if (data->big_joiner_output[count] == output->id) {
- big_joiner_output[count] = output;
+ if (data->output[count].output_id == output->id) {
+ bigjoiner_output[count] = output;
count++;
}
@@ -169,14 +172,12 @@ static void test_dual_display(data_t *data)
break;
}
- igt_output_set_pipe(big_joiner_output[0], data->pipe1);
- igt_output_set_pipe(big_joiner_output[1], data->pipe2);
+ igt_output_set_pipe(bigjoiner_output[0], data->pipe1);
+ igt_output_set_pipe(bigjoiner_output[1], data->pipe2);
/* Set up first big joiner output on Pipe A*/
- igt_sort_connector_modes(big_joiner_output[0]->config.connector,
- sort_drm_modes_by_res_dsc);
- mode = &big_joiner_output[0]->config.connector->modes[0];
- igt_output_override_mode(big_joiner_output[0], mode);
+ mode = &data->output[0].mode;
+ igt_output_override_mode(bigjoiner_output[0], mode);
pipe = &display->pipes[data->pipe1];
plane1 = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
@@ -186,10 +187,8 @@ static void test_dual_display(data_t *data)
igt_plane_set_size(plane1, mode->hdisplay, mode->vdisplay);
/* Set up second big joiner output on Pipe C*/
- igt_sort_connector_modes(big_joiner_output[1]->config.connector,
- sort_drm_modes_by_res_dsc);
- mode = &big_joiner_output[1]->config.connector->modes[0];
- igt_output_override_mode(big_joiner_output[1], mode);
+ mode = &data->output[1].mode;
+ igt_output_override_mode(bigjoiner_output[1], mode);
pipe = &display->pipes[data->pipe2];
plane2 = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
@@ -201,13 +200,23 @@ static void test_dual_display(data_t *data)
igt_display_commit2(display, COMMIT_ATOMIC);
/* Clean up */
- igt_output_set_pipe(big_joiner_output[0], PIPE_NONE);
- igt_output_set_pipe(big_joiner_output[1], PIPE_NONE);
+ igt_output_set_pipe(bigjoiner_output[0], PIPE_NONE);
+ igt_output_set_pipe(bigjoiner_output[1], PIPE_NONE);
igt_plane_set_fb(plane1, NULL);
igt_plane_set_fb(plane2, NULL);
igt_display_commit2(display, COMMIT_ATOMIC);
}
+static bool bigjoiner_mode_found(drmModeConnector *connector,
+ int (*sort_method)(const void *, const void*),
+ drmModeModeInfo *mode)
+{
+ igt_sort_connector_modes(connector, sort_method);
+ *mode = connector->modes[0];
+
+ return igt_bigjoiner_possible(mode, max_dotclock);
+}
+
igt_main
{
data_t data;
@@ -224,13 +233,24 @@ igt_main
igt_display_require(&data.display, data.drm_fd);
igt_require(data.display.is_atomic);
- for_each_connected_output(&data.display, output) {
- igt_sort_connector_modes(output->config.connector,
- sort_drm_modes_by_res_dsc);
+ max_dotclock = igt_get_max_dotclock(data.drm_fd);
- mode = &output->config.connector->modes[0];
- if (mode->hdisplay > MAX_HDISPLAY_PER_PIPE) {
- data.big_joiner_output[count++] = output->id;
+ for_each_connected_output(&data.display, output) {
+ bool found = false;
+ drmModeConnector *connector = output->config.connector;
+
+ /*
+ * Bigjoiner will come in to the picture when the
+ * resolution > 5K or clock > max-dot-clock.
+ */
+ found = (bigjoiner_mode_found(connector, sort_drm_modes_by_res_dsc, mode) ||
+ bigjoiner_mode_found(connector, sort_drm_modes_by_clk_dsc, mode)) ?
+ true : false;
+
+ if (found) {
+ data.output[count].output_id = output->id;
+ memcpy(&data.output[count].mode, mode, sizeof(drmModeModeInfo));
+ count++;
width = max(width, mode->hdisplay);
height = max(height, mode->vdisplay);
@@ -245,7 +265,7 @@ igt_main
j++;
}
- igt_require_f(count > 0, "No output with 5k+ mode found\n");
+ igt_require_f(count > 0, "No output with 5k+ mode (or) clock > max-dot-clock found\n");
igt_create_pattern_fb(data.drm_fd, width, height, DRM_FORMAT_XRGB8888,
DRM_FORMAT_MOD_LINEAR, &data.fb);
@@ -267,14 +287,12 @@ igt_main
igt_display_reset(&data.display);
for_each_connected_output(&data.display, output) {
- if (data.big_joiner_output[0] != output->id)
+ if (data.output[0].output_id != output->id)
continue;
- igt_sort_connector_modes(output->config.connector,
- sort_drm_modes_by_res_dsc);
-
+ mode = &data.output[0].mode;
igt_output_set_pipe(output, data.pipe1);
- igt_output_override_mode(output, &output->config.connector->modes[0]);
+ igt_output_override_mode(output, mode);
igt_dynamic_f("pipe-%s-%s",
kmstest_pipe_name(data.pipe1),
@@ -291,17 +309,15 @@ igt_main
igt_display_reset(&data.display);
for_each_connected_output(&data.display, output) {
- igt_sort_connector_modes(output->config.connector,
- sort_drm_modes_by_res_dsc);
-
- if (data.big_joiner_output[0] == output->id) {
+ if (data.output[0].output_id == output->id) {
first_output = output;
+ mode = &data.output[0].mode;
+
igt_output_set_pipe(output, data.pipe1);
- igt_output_override_mode(output, &output->config.connector->modes[0]);
+ igt_output_override_mode(output, mode);
} else if (second_output == NULL) {
second_output = output;
igt_output_set_pipe(output, data.pipe2);
- igt_output_override_mode(output, &output->config.connector->modes[0]);
break;
}
--
2.40.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-11-13 8:29 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-17 5:24 [igt-dev] [i-g-t 0/5] Fix Bigjoiner checks Bhanuprakash Modem
2023-05-17 5:24 ` [igt-dev] [i-g-t 1/5] tests: s/i915_pipe_output_combo_valid/intel_pipe_output_combo_valid/ Bhanuprakash Modem
2023-05-17 5:24 ` [igt-dev] [i-g-t 2/5] lib/igt_kms: s/is_i915_device/is_intel_device Bhanuprakash Modem
2023-05-17 5:24 ` [igt-dev] [i-g-t 3/5] tests/i915/kms_big_joiner: Fix Bigjoiner checks Bhanuprakash Modem
2023-05-17 5:24 ` [igt-dev] [i-g-t 4/5] tests/kms_flip: " Bhanuprakash Modem
2023-05-17 5:24 ` [igt-dev] [i-g-t 5/5] tests/kms_setmode: " Bhanuprakash Modem
2023-05-17 6:18 ` [igt-dev] ✓ Fi.CI.BAT: success for Fix Bigjoiner checks (rev7) Patchwork
2023-05-17 15:25 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2023-11-13 8:19 [igt-dev] [i-g-t 0/5] Fix Bigjoiner checks Bhanuprakash Modem
2023-11-13 8:19 ` [igt-dev] [i-g-t 3/5] tests/i915/kms_big_joiner: " Bhanuprakash Modem
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox