[igt-dev] [i-g-t V3 03/52] tests/kms_async_flips: Add support for Bigjoiner

Bhanuprakash Modem
2022-09-09T14:06:15Z

tests/kms_async_flips.c | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/tests/kms_async_flips.c b/tests/kms_async_flips.c
index 695aea74..b0f1c530 100644
--- a/tests/kms_async_flips.c
+++ b/tests/kms_async_flips.c
@@ -330,15 +330,6 @@ static void test_cursor(data_t *data)
struct igt_fb cursor_fb;
struct drm_mode_cursor cur;

- /*
- * Intel's PSR2 selective fetch adds other planes to state when
- * necessary, causing the async flip to fail because async flip is not
- * supported in cursor plane.
- */
- igt_skip_on_f(i915_psr2_selective_fetch_check(data->drm_fd),
- "PSR2 sel fetch causes cursor to be added to primary plane " \
- "pages flips and async flip is not supported in cursor\n");
-
do_or_die(drmGetCap(data->drm_fd, DRM_CAP_CURSOR_WIDTH, &width));
do_or_die(drmGetCap(data->drm_fd, DRM_CAP_CURSOR_WIDTH, &height));

@@ -380,12 +371,12 @@ static void test_invalid(data_t *data)
struct igt_fb fb;
drmModeModeInfo *mode;

+ test_init(data);
+
mode = igt_output_get_mode(data->output);
width = mode->hdisplay;
height = mode->vdisplay;

- test_init(data);
-
igt_create_fb(data->drm_fd, width, height, DRM_FORMAT_XRGB8888,
I915_FORMAT_MOD_Y_TILED, &fb);

@@ -542,9 +533,16 @@ static void run_test(data_t *data, void (*test)(data_t *))
{
igt_output_t *output;
enum pipe pipe;
+ igt_display_t *display = &data->display;
+
+ for_each_pipe(display, pipe) {
+ for_each_valid_output_on_pipe(display, pipe, output) {
+ igt_display_reset(display);
+
+ igt_output_set_pipe(output, pipe);
+ if (!i915_pipe_output_combo_valid(display))
+ continue;

- for_each_pipe(&data->display, pipe) {
- for_each_valid_output_on_pipe(&data->display, pipe, output) {
igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), output->name) {
data->output = output;
data->pipe = pipe;
--
2.35.1