From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2060.outbound.protection.outlook.com [40.107.93.60]) by gabe.freedesktop.org (Postfix) with ESMTPS id C73DE10E03C for ; Fri, 11 Aug 2023 22:38:30 +0000 (UTC) Message-ID: <58354771-0396-eb63-c5f4-93d5232dca22@amd.com> Date: Fri, 11 Aug 2023 16:38:25 -0600 To: Hersen Wu , 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 References: <20230811221223.57193-1-hersenxs.wu@amd.com> Content-Language: en-US From: Alex Hung In-Reply-To: <20230811221223.57193-1-hersenxs.wu@amd.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit MIME-Version: 1.0 Subject: Re: [igt-dev] [PATCH 1/2] [i-g-t] lib/igt_kms: Re-try display_require if require output is not valid List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: markyacoub@google.com Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: Reviewed-by: Alex Hung On 2023-08-11 16:12, Hersen Wu wrote: > Add igt_display_require_retry to re-try igt_display_require. > > At entry of each test, display setup is done by > igt_display_require and igt_display_require_output. > igt display require output may not be valid yet, > this will let test be skipped. By re-try > igt_display_require, require output could be valid. > This will fix test case intermittent skip issue. > > Signed-off-by: Hersen Wu > --- > lib/igt_kms.c | 19 +++++++++++++++++++ > lib/igt_kms.h | 15 +++++++++++++++ > 2 files changed, 34 insertions(+) > > diff --git a/lib/igt_kms.c b/lib/igt_kms.c > index e0959ccff..5506e2eb2 100644 > --- a/lib/igt_kms.c > +++ b/lib/igt_kms.c > @@ -2862,6 +2862,25 @@ void igt_display_require_output(igt_display_t *display) > igt_skip("No valid crtc/connector combinations found.\n"); > } > > +/** > + * is_igt_display_require_output_valid: > + * @display: A pointer to an #igt_display_t structure > + * > + * Checks whether there's a valid @pipe/@output combination for the given @display > + * Returns: true if a valid combination of @pipe and @output is found, or false > + * if not found > + */ > +bool is_igt_display_require_output_valid(igt_display_t *display) > +{ > + enum pipe pipe; > + igt_output_t *output; > + > + for_each_pipe_with_valid_output(display, pipe, output) > + return true; > + > + return false; > +} > + > /** > * igt_display_require_output_on_pipe: > * @display: A pointer to an #igt_display_t structure > diff --git a/lib/igt_kms.h b/lib/igt_kms.h > index 91355c910..f801b87e6 100644 > --- a/lib/igt_kms.h > +++ b/lib/igt_kms.h > @@ -485,6 +485,7 @@ int igt_display_drop_events(igt_display_t *display); > int igt_display_get_n_pipes(igt_display_t *display); > void igt_display_require_output(igt_display_t *display); > void igt_display_require_output_on_pipe(igt_display_t *display, enum pipe pipe); > +bool is_igt_display_require_output_valid(igt_display_t *display); > > const char *igt_output_name(igt_output_t *output); > drmModeModeInfo *igt_output_get_mode(igt_output_t *output); > @@ -722,6 +723,20 @@ uint64_t igt_plane_get_prop(igt_plane_t *plane, enum igt_atomic_plane_properties > igt_plane_set_prop_changed(plane, prop); \ > } while (0) > > +#define igt_display_require_retry(display, fd, delay, retry_times) \ > + for (int j__ = 0; j__ < retry_times + 1; j__++) { \ > + igt_display_require(display, fd); \ > + if (is_igt_display_require_output_valid(display)) { \ > + if (j__ > 0) \ > + igt_info("retry times:%d delay:%d seconds\n", j__, delay * j__); \ > + break; \ > + } \ > + if (j__ == retry_times) \ > + igt_skip("No valid crtc/connector combinations found.\n"); \ > + else \ > + sleep(delay); \ > + } > + > extern bool igt_plane_try_prop_enum(igt_plane_t *plane, > enum igt_atomic_plane_properties prop, > const char *val);