From: Alex Hung <alex.hung@amd.com>
To: Hersen Wu <hersenxs.wu@amd.com>,
igt-dev@lists.freedesktop.org, rodrigo.siqueira@amd.com,
aurabindo.pillai@amd.com, stylon.wang@amd.com,
hamza.mahfooz@amd.com, sunpeng.li@amd.com
Cc: markyacoub@google.com
Subject: Re: [igt-dev] [PATCH 2/2] [i-g-t] tests/amdgpu: Fix display tests be skipped intermittently
Date: Fri, 11 Aug 2023 16:38:41 -0600 [thread overview]
Message-ID: <f030d413-24aa-272e-b476-44cd26aeca0d@amd.com> (raw)
In-Reply-To: <20230811221223.57193-2-hersenxs.wu@amd.com>
Reviewed-by: Alex Hung <alex.hung@amd.com>
On 2023-08-11 16:12, Hersen Wu wrote:
> Use igt_display_require_retry 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 <hersenxs.wu@amd.com>
> ---
> 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..796c79eec 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_require_retry(&data.display, data.fd, 2, 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..351742205 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_require_retry(&data.display, data.drm_fd, 2, 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..c2f2f1824 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_require_retry(&data.display, data.fd, 2, 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..2c2f4c0ff 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_require_retry(&data.display, data.fd, 2, 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..226ea7d37 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_require_retry(&data.display, data.drm_fd, 2, 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..698446826 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_require_retry(&data.display, data.fd, 2, 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..e332ce57d 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_require_retry(&data.display, data.drm_fd, 2, 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..41bb5ac45 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_require_retry(&data.display, data.drm_fd, 2, 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..d67abf0ad 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_require_retry(&data.display, data.fd, 2, 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..52b28a57f 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_require_retry(&data.display, data.fd, 5, 2);
> 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..e7ac81800 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_require_retry(&data.display, data.fd, 2, 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..394fdf31f 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_require_retry(&data.display, data.fd, 2, 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..d1c332924 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_require_retry(&data.display, data.fd, 2, 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..223f99c62 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_require_retry(&data.display, data.fd, 2, 2);
> igt_require(data.display.is_atomic);
> - igt_display_require_output(&data.display);
> }
>
> igt_describe("Hard coded Freesync EDID parsing");
next prev parent reply other threads:[~2023-08-11 22:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-11 22:12 [igt-dev] [PATCH 1/2] [i-g-t] lib/igt_kms: Re-try display_require if require output is not valid Hersen Wu
2023-08-11 22:12 ` [igt-dev] [PATCH 2/2] [i-g-t] tests/amdgpu: Fix display tests be skipped intermittently Hersen Wu
2023-08-11 22:38 ` Alex Hung [this message]
2023-08-11 22:38 ` [igt-dev] [PATCH 1/2] [i-g-t] lib/igt_kms: Re-try display_require if require output is not valid Alex Hung
2023-08-11 23:30 ` [igt-dev] ○ CI.xeBAT: info for series starting with [1/2,i-g-t] " Patchwork
2023-08-11 23:42 ` [igt-dev] ✓ Fi.CI.BAT: success " Patchwork
2023-08-13 5:43 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2023-08-14 5:52 ` [igt-dev] [PATCH 1/2] [i-g-t] " Modem, Bhanuprakash
-- strict thread matches above, loose matches on Subject: below --
2023-11-22 17:20 [igt-dev] [PATCH 1/2] [i-g-t] lib/igt_amd: " Hersen Wu
2023-11-22 17:20 ` [igt-dev] [PATCH 2/2] [i-g-t] tests/amdgpu: Fix display tests be skipped intermittently Hersen Wu
2023-08-10 14:52 [igt-dev] [PATCH 1/2] [i-g-t] lib/igt_kms: Re-try display_require if require output is not valid Hersen Wu
2023-08-10 14:52 ` [igt-dev] [PATCH 2/2] [i-g-t] tests/amdgpu: Fix display tests be skipped intermittently Hersen Wu
2023-08-11 15:15 ` Wu, Hersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f030d413-24aa-272e-b476-44cd26aeca0d@amd.com \
--to=alex.hung@amd.com \
--cc=aurabindo.pillai@amd.com \
--cc=hamza.mahfooz@amd.com \
--cc=hersenxs.wu@amd.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=markyacoub@google.com \
--cc=rodrigo.siqueira@amd.com \
--cc=stylon.wang@amd.com \
--cc=sunpeng.li@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.