From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2043.outbound.protection.outlook.com [40.107.101.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 74BBF10E555 for ; Thu, 10 Aug 2023 14:53:05 +0000 (UTC) From: Hersen Wu To: , , , , , , Date: Thu, 10 Aug 2023 10:52:57 -0400 Message-ID: <20230810145257.88389-2-hersenxs.wu@amd.com> In-Reply-To: <20230810145257.88389-1-hersenxs.wu@amd.com> References: <20230810145257.88389-1-hersenxs.wu@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Subject: [igt-dev] [PATCH 2/2] [i-g-t] tests/amdgpu: Fix display tests be skipped intermittently List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hersen Wu , markyacoub@google.com Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: Use igt_display_setup to re-try igt_display_require if igt dislay require output is not valid. If previous test run suspend-resume test, current test igt display require output may not be valid after initial igt_display_require. This will let current test be skipped. By re-try igt_display_require, igt display require output could be valid. Signed-off-by: Hersen Wu --- tests/amdgpu/amd_assr.c | 3 +-- tests/amdgpu/amd_bypass.c | 3 +-- tests/amdgpu/amd_color.c | 3 +-- tests/amdgpu/amd_dp_dsc.c | 6 +++--- tests/amdgpu/amd_freesync_video_mode.c | 3 +-- tests/amdgpu/amd_hotplug.c | 3 +-- tests/amdgpu/amd_ilr.c | 3 +-- tests/amdgpu/amd_link_settings.c | 3 +-- tests/amdgpu/amd_max_bpc.c | 3 +-- tests/amdgpu/amd_mem_leak.c | 3 +-- tests/amdgpu/amd_mode_switch.c | 5 ++--- tests/amdgpu/amd_plane.c | 3 +-- tests/amdgpu/amd_psr.c | 5 ++--- tests/amdgpu/amd_vrr_range.c | 3 +-- 14 files changed, 18 insertions(+), 31 deletions(-) diff --git a/tests/amdgpu/amd_assr.c b/tests/amdgpu/amd_assr.c index fc2367f99..6f4884d3b 100644 --- a/tests/amdgpu/amd_assr.c +++ b/tests/amdgpu/amd_assr.c @@ -281,9 +281,8 @@ igt_main kmstest_set_vt_graphics_mode(); - igt_display_require(&data.display, data.fd); + igt_display_setup(&data.display, data.fd, 2); igt_require(data.display.is_atomic); - igt_display_require_output(&data.display); } igt_describe("Test ASSR on connected DP/eDP links"); diff --git a/tests/amdgpu/amd_bypass.c b/tests/amdgpu/amd_bypass.c index d192a30ea..1c2756ae1 100644 --- a/tests/amdgpu/amd_bypass.c +++ b/tests/amdgpu/amd_bypass.c @@ -387,9 +387,8 @@ igt_main kmstest_set_vt_graphics_mode(); - igt_display_require(&data.display, data.drm_fd); + igt_display_setup(&data.display, data.drm_fd, 2); igt_require(data.display.is_atomic); - igt_display_require_output(&data.display); } igt_subtest("8bpc-bypass-mode") diff --git a/tests/amdgpu/amd_color.c b/tests/amdgpu/amd_color.c index 34002ed88..6918f2b3c 100644 --- a/tests/amdgpu/amd_color.c +++ b/tests/amdgpu/amd_color.c @@ -404,9 +404,8 @@ igt_main kmstest_set_vt_graphics_mode(); - igt_display_require(&data.display, data.fd); + igt_display_setup(&data.display, data.fd, 2); igt_require(data.display.is_atomic); - igt_display_require_output(&data.display); } igt_subtest("crtc-linear-degamma") test_crtc_linear_degamma(&data); diff --git a/tests/amdgpu/amd_dp_dsc.c b/tests/amdgpu/amd_dp_dsc.c index e782ce84a..aa5e2ed08 100644 --- a/tests/amdgpu/amd_dp_dsc.c +++ b/tests/amdgpu/amd_dp_dsc.c @@ -526,12 +526,12 @@ igt_main { data.fd = drm_open_driver_master(DRIVER_ANY); - igt_display_require(&data.display, data.fd); + kmstest_set_vt_graphics_mode(); + + igt_display_setup(&data.display, data.fd, 2); igt_require(data.display.is_atomic); - igt_display_require_output(&data.display); igt_amd_require_dsc(&data.display, data.fd); - kmstest_set_vt_graphics_mode(); } igt_describe("Forces DSC on/off & ensures it is reset properly"); diff --git a/tests/amdgpu/amd_freesync_video_mode.c b/tests/amdgpu/amd_freesync_video_mode.c index 7716598dc..54c2121a8 100644 --- a/tests/amdgpu/amd_freesync_video_mode.c +++ b/tests/amdgpu/amd_freesync_video_mode.c @@ -871,9 +871,8 @@ igt_main { igt_skip("Not an amdgpu driver.\n"); } kmstest_set_vt_graphics_mode(); - igt_display_require(&data.display, data.drm_fd); + igt_display_setup(&data.display, data.drm_fd, 2); igt_require(data.display.is_atomic); - igt_display_require_output(&data.display); } /* Expectation: Modeset happens instantaneously without blanking */ diff --git a/tests/amdgpu/amd_hotplug.c b/tests/amdgpu/amd_hotplug.c index c13bf49d3..73e3fef35 100644 --- a/tests/amdgpu/amd_hotplug.c +++ b/tests/amdgpu/amd_hotplug.c @@ -165,9 +165,8 @@ igt_main kmstest_set_vt_graphics_mode(); - igt_display_require(&data.display, data.fd); + igt_display_setup(&data.display, data.fd, 2); igt_require(data.display.is_atomic); - igt_display_require_output(&data.display); igt_amd_require_hpd(&data.display, data.fd); } diff --git a/tests/amdgpu/amd_ilr.c b/tests/amdgpu/amd_ilr.c index 50ca93a14..ca63e9c28 100644 --- a/tests/amdgpu/amd_ilr.c +++ b/tests/amdgpu/amd_ilr.c @@ -264,9 +264,8 @@ igt_main kmstest_set_vt_graphics_mode(); - igt_display_require(&data.display, data.drm_fd); + igt_display_setup(&data.display, data.drm_fd, 2); igt_require(data.display.is_atomic); - igt_display_require_output(&data.display); } igt_describe("Test ILR by trying training link rate at all supported ILRs"); diff --git a/tests/amdgpu/amd_link_settings.c b/tests/amdgpu/amd_link_settings.c index 6a7e8cc53..4509e7f9c 100644 --- a/tests/amdgpu/amd_link_settings.c +++ b/tests/amdgpu/amd_link_settings.c @@ -237,9 +237,8 @@ igt_main kmstest_set_vt_graphics_mode(); - igt_display_require(&data.display, data.drm_fd); + igt_display_setup(&data.display, data.drm_fd, 2); igt_require(data.display.is_atomic); - igt_display_require_output(&data.display); } igt_describe("Retrieves all link settings configurations and retrains " diff --git a/tests/amdgpu/amd_max_bpc.c b/tests/amdgpu/amd_max_bpc.c index effe830a2..9fe71d946 100644 --- a/tests/amdgpu/amd_max_bpc.c +++ b/tests/amdgpu/amd_max_bpc.c @@ -132,9 +132,8 @@ igt_main kmstest_set_vt_graphics_mode(); - igt_display_require(&data.display, data.fd); + igt_display_setup(&data.display, data.fd, 2); igt_require(data.display.is_atomic); - igt_display_require_output(&data.display); } igt_describe("Tests overly high 'max bpc' should not affect 4K modes on HDMI"); diff --git a/tests/amdgpu/amd_mem_leak.c b/tests/amdgpu/amd_mem_leak.c index e4a4b5c47..7fc7f608c 100644 --- a/tests/amdgpu/amd_mem_leak.c +++ b/tests/amdgpu/amd_mem_leak.c @@ -219,9 +219,8 @@ igt_main kmstest_set_vt_graphics_mode(); - igt_display_require(&data.display, data.fd); + igt_display_setup(&data.display, data.fd, 5); igt_require(data.display.is_atomic); - igt_display_require_output(&data.display); } igt_describe("Test memory leaks after resume from suspend"); diff --git a/tests/amdgpu/amd_mode_switch.c b/tests/amdgpu/amd_mode_switch.c index 270b1b9f6..5b69269b9 100644 --- a/tests/amdgpu/amd_mode_switch.c +++ b/tests/amdgpu/amd_mode_switch.c @@ -191,9 +191,8 @@ igt_main kmstest_set_vt_graphics_mode(); - igt_display_require(&data.display, data.fd); - igt_require(&data.display.is_atomic); - igt_display_require_output(&data.display); + igt_display_setup(&data.display, data.fd, 2); + igt_require(data.display.is_atomic); } for (i = 0; i < MAX_PIPES; i++) { diff --git a/tests/amdgpu/amd_plane.c b/tests/amdgpu/amd_plane.c index ee7de5778..6dadca37f 100644 --- a/tests/amdgpu/amd_plane.c +++ b/tests/amdgpu/amd_plane.c @@ -910,9 +910,8 @@ igt_main kmstest_set_vt_graphics_mode(); - igt_display_require(&data.display, data.fd); + igt_display_setup(&data.display, data.fd, 2); igt_require(data.display.is_atomic); - igt_display_require_output(&data.display); } igt_describe("MPO with 4K planes"); diff --git a/tests/amdgpu/amd_psr.c b/tests/amdgpu/amd_psr.c index 9da161a09..d753f0499 100644 --- a/tests/amdgpu/amd_psr.c +++ b/tests/amdgpu/amd_psr.c @@ -715,9 +715,8 @@ igt_main_args("", long_options, help_str, opt_handler, NULL) kmstest_set_vt_graphics_mode(); - igt_display_require(&data.display, data.fd); - igt_require(&data.display.is_atomic); - igt_display_require_output(&data.display); + igt_display_setup(&data.display, data.fd, 2); + igt_require(data.display.is_atomic); /* check if visual confirm option available */ if (opt.visual_confirm) { diff --git a/tests/amdgpu/amd_vrr_range.c b/tests/amdgpu/amd_vrr_range.c index a77895622..a626e607d 100644 --- a/tests/amdgpu/amd_vrr_range.c +++ b/tests/amdgpu/amd_vrr_range.c @@ -388,9 +388,8 @@ igt_main kmstest_set_vt_graphics_mode(); - igt_display_require(&data.display, data.fd); + igt_display_setup(&data.display, data.fd, 2); igt_require(data.display.is_atomic); - igt_display_require_output(&data.display); } igt_describe("Hard coded Freesync EDID parsing"); -- 2.25.1