From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1A03610FDFD for ; Fri, 17 Jun 2022 08:19:57 +0000 (UTC) Date: Fri, 17 Jun 2022 11:17:58 +0300 From: Petri Latvala To: Nidhi Gupta Message-ID: References: <20220617041547.28298-1-nidhi1.gupta@intel.com> <20220617041547.28298-2-nidhi1.gupta@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220617041547.28298-2-nidhi1.gupta@intel.com> Subject: Re: [igt-dev] [PATCH i-g-t 1/2] tests/kms_invalid_mode.c: Convert tests to dynamic List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: igt-dev@lists.freedesktop.org Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: On Fri, Jun 17, 2022 at 09:45:45AM +0530, Nidhi Gupta wrote: > Convert the existing subtests to dynamic subtests at pipe level. > > Signed-off-by: Nidhi Gupta > --- > tests/kms_invalid_mode.c | 45 ++++++++++++++++++++-------------------- > 1 file changed, 23 insertions(+), 22 deletions(-) > > diff --git a/tests/kms_invalid_mode.c b/tests/kms_invalid_mode.c > index 630798d8..00de1150 100644 > --- a/tests/kms_invalid_mode.c > +++ b/tests/kms_invalid_mode.c > @@ -32,6 +32,7 @@ typedef struct _data data_t; > > struct _data { > int drm_fd; > + enum pipe pipe; > igt_display_t display; > igt_output_t *output; > drmModeResPtr res; > @@ -177,21 +178,21 @@ adjust_mode_bad_vtotal(data_t *data, drmModeModeInfoPtr mode) > return true; > } > > -static int > +static void > test_output(data_t *data) > { > igt_output_t *output = data->output; > drmModeModeInfo mode; > struct igt_fb fb; > - int i; > + int i, valid_connectors = 0; > + uint32_t crtc_id; > > /* > * FIXME test every mode we have to be more > * sure everything is really getting rejected? > */ > mode = *igt_output_get_mode(output); > - if (!data->adjust_mode(data, &mode)) > - return 0; > + igt_skip_on(!data->adjust_mode(data, &mode)); > > igt_create_fb(data->drm_fd, > max_t(uint16_t, mode.hdisplay, 64), > @@ -202,13 +203,11 @@ test_output(data_t *data) > > kmstest_unset_all_crtcs(data->drm_fd, data->res); > > + crtc_id = data->display.pipes[data->pipe].crtc_id; > + > for (i = 0; i < data->res->count_crtcs; i++) { > int ret; If this function now operates on the passed pipe, why is this loop still here? -- Petri Latvala > - > - igt_info("Checking pipe %c connector %s with mode %s\n", > - 'A'+i, output->name, mode.name); > - > - ret = drmModeSetCrtc(data->drm_fd, data->res->crtcs[i], > + ret = drmModeSetCrtc(data->drm_fd, crtc_id, > fb.fb_id, 0, 0, > &output->id, 1, &mode); > igt_assert_lt(ret, 0); > @@ -216,18 +215,10 @@ test_output(data_t *data) > > igt_remove_fb(data->drm_fd, &fb); > > - return 1; > -} > - > -static void test(data_t *data) > -{ > - int valid_connectors = 0; > - > - for_each_connected_output(&data->display, data->output) { > - valid_connectors += test_output(data); > - } > + valid_connectors++; > > igt_require_f(valid_connectors, "No suitable connectors found\n"); > + > } > > static int i915_max_dotclock(data_t *data) > @@ -297,6 +288,10 @@ static data_t data; > > igt_main > { > + > + enum pipe pipe; > + igt_output_t *output; > + > igt_fixture { > data.drm_fd = drm_open_driver_master(DRIVER_ANY); > > @@ -311,9 +306,15 @@ igt_main > } > > for (int i = 0; i < ARRAY_SIZE(subtests); i++) { > - igt_subtest(subtests[i].name) { > - data.adjust_mode = subtests[i].adjust_mode; > - test(&data); > + igt_subtest_with_dynamic(subtests[i].name) { > + for_each_pipe_with_valid_output(&data.display, pipe, output) { > + igt_dynamic_f("%s-pipe-%s", igt_output_name(output), kmstest_pipe_name(pipe)) { > + data.output = output; > + data.pipe = pipe; > + data.adjust_mode = subtests[i].adjust_mode; > + test_output(&data); > + } > + } > } > } > > -- > 2.26.2 >