Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 276E510E091 for ; Mon, 12 Sep 2022 08:00:10 +0000 (UTC) Message-ID: <6552114d-1b9f-c273-e601-2e4cd34900c0@intel.com> Date: Mon, 12 Sep 2022 13:29:50 +0530 Content-Language: en-US To: Mohammed Thasleem , References: <20220829173333.60263-1-mohammed.thasleem@intel.com> <20220829173333.60263-3-mohammed.thasleem@intel.com> From: "Modem, Bhanuprakash" In-Reply-To: <20220829173333.60263-3-mohammed.thasleem@intel.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit MIME-Version: 1.0 Subject: Re: [igt-dev] [PATCH v7 2/2] tests/kms_lease: Test Cleanup List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: On Mon-29-08-2022 11:03 pm, Mohammed Thasleem wrote: > Sanitize the system state before starting the subtest. > > v2: Minor changes. > v3: Moved display reset and commit in to igt_subtest_with_dynamic_f. > v4: Separated display and non-display subsets. > v5: Removed pipe_to_crtc_id and crtc_id_to_pipe. > > Signed-off-by: Mohammed Thasleem > --- > tests/kms_lease.c | 200 +++++++++++++++++++++++----------------------- > 1 file changed, 99 insertions(+), 101 deletions(-) > > diff --git a/tests/kms_lease.c b/tests/kms_lease.c > index bd713343..5d303a16 100644 > --- a/tests/kms_lease.c > +++ b/tests/kms_lease.c > @@ -64,22 +64,6 @@ typedef struct { > uint32_t plane_id; > } data_t; > > -static uint32_t pipe_to_crtc_id(igt_display_t *display, enum pipe pipe) > -{ > - return display->pipes[pipe].crtc_id; > -} > - > -static enum pipe crtc_id_to_pipe(igt_display_t *display, uint32_t crtc_id) > -{ > - enum pipe pipe; > - > - for_each_pipe(display, pipe) { > - if(display->pipes[pipe].crtc_id == crtc_id) > - return pipe; > - } > - return -1; > -} > - > static igt_output_t *connector_id_to_output(igt_display_t *display, uint32_t connector_id) As mentioned in earlier revisions, you can drop this function & have the output in data (data->output) > { > drmModeConnector connector; > @@ -88,12 +72,12 @@ static igt_output_t *connector_id_to_output(igt_display_t *display, uint32_t con > return igt_output_from_connector(display, &connector); > } > > -static int prepare_crtc(lease_t *lease, uint32_t connector_id, uint32_t crtc_id) > +static int prepare_crtc(lease_t *lease, data_t *data) > { > drmModeModeInfo *mode; > igt_display_t *display = &lease->display; > - igt_output_t *output = connector_id_to_output(display, connector_id); > - enum pipe pipe = crtc_id_to_pipe(display, crtc_id); > + igt_output_t *output = connector_id_to_output(display, data->connector_id); > + enum pipe pipe = data->pipe; > igt_plane_t *primary; > int ret; > > @@ -136,7 +120,7 @@ static void cleanup_crtc(lease_t *lease, igt_output_t *output) > primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); > igt_plane_set_fb(primary, NULL); > > - igt_output_set_pipe(output, PIPE_ANY); > + igt_output_set_pipe(output, PIPE_NONE); > igt_display_commit(display); > } > > @@ -238,7 +222,7 @@ static void simple_lease(data_t *data) > igt_display_require(&lease.display, lease.fd); > > /* Set a mode on the leased output */ > - igt_assert_eq(0, prepare_crtc(&lease, data->connector_id, data->crtc_id)); > + igt_assert_eq(0, prepare_crtc(&lease, data)); > > /* Paint something attractive */ > paint_fb(lease.fd, &lease.primary_fb, "simple_lease", > @@ -266,7 +250,6 @@ static void page_flip_implicit_plane(data_t *data) > drmModePlaneRes *plane_resources; > uint32_t wrong_plane_id = 0; > int i; > - enum pipe pipe; As done in prepare_crtc(), use enum pipe pipe = data->pipe; to avoid code churn. > igt_display_t *display; > > /* find a plane which isn't the primary one for us */ > @@ -292,7 +275,7 @@ static void page_flip_implicit_plane(data_t *data) > drmSetClientCap(data->master.fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1); > > /* Set a mode on the leased output */ > - igt_assert_eq(0, prepare_crtc(&data->master, data->connector_id, data->crtc_id)); > + igt_assert_eq(0, prepare_crtc(&data->master, data)); > > /* sanity check */ > do_or_die(drmModePageFlip(data->master.fd, data->crtc_id, > @@ -300,10 +283,9 @@ static void page_flip_implicit_plane(data_t *data) > 0, NULL)); > > display = &data->master.display; > - pipe = crtc_id_to_pipe(display, data->crtc_id); > > igt_wait_for_vblank(data->master.fd, > - display->pipes[pipe].crtc_offset); > + display->pipes[data->pipe].crtc_offset); Please check the above comment. > > do_or_die(drmModePageFlip(mcl.fd, data->crtc_id, > data->master.primary_fb.fb_id, > @@ -313,10 +295,8 @@ static void page_flip_implicit_plane(data_t *data) > object_ids[mcl.object_count++] = wrong_plane_id; > do_or_die(create_lease(data->master.fd, &mcl)); > > - pipe = crtc_id_to_pipe(display, data->crtc_id); > - > igt_wait_for_vblank(data->master.fd, > - display->pipes[pipe].crtc_offset); > + display->pipes[data->pipe].crtc_offset); > > igt_assert_eq(drmModePageFlip(mcl.fd, data->crtc_id, > data->master.primary_fb.fb_id, > @@ -363,7 +343,7 @@ static void setcrtc_implicit_plane(data_t *data) > drmSetClientCap(data->master.fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1); > > /* Set a mode on the leased output */ > - igt_assert_eq(0, prepare_crtc(&data->master, data->connector_id, data->crtc_id)); > + igt_assert_eq(0, prepare_crtc(&data->master, data)); > > /* sanity check */ > do_or_die(drmModeSetCrtc(data->master.fd, data->crtc_id, -1, > @@ -404,7 +384,7 @@ static void cursor_implicit_plane(data_t *data) > drmSetClientCap(data->master.fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1); > > /* Set a mode on the leased output */ > - igt_assert_eq(0, prepare_crtc(&data->master, data->connector_id, data->crtc_id)); > + igt_assert_eq(0, prepare_crtc(&data->master, data)); > > /* sanity check */ > do_or_die(drmModeSetCursor(data->master.fd, data->crtc_id, 0, 0, 0)); > @@ -642,8 +622,8 @@ static void lease_unleased_crtc(data_t *data) > for_each_pipe(&data->master.display, p) { > if (bad_crtc_id != 0) > break; > - if (pipe_to_crtc_id(&data->master.display, p) != data->crtc_id) > - bad_crtc_id = pipe_to_crtc_id(&data->master.display, p); > + if (data->master.display.pipes[p].crtc_id != data->crtc_id) > + bad_crtc_id = data->master.display.pipes[p].crtc_id; > } > > /* Give up if there isn't another crtc */ > @@ -729,7 +709,7 @@ static void lease_revoke(data_t *data) > igt_assert_eq(revoke_lease(data->master.fd, &mrl), 0); > > /* Try to use the leased objects */ > - ret = prepare_crtc(&lease, data->connector_id, data->crtc_id); > + ret = prepare_crtc(&lease, data); > > /* Ensure that the expected error is returned */ > igt_assert_eq(ret, -ENOENT); > @@ -1185,83 +1165,101 @@ igt_main > igt_output_t *output; > igt_display_t *display = &data.master.display; > > - const struct { > - const char *name; > - void (*func)(data_t *); > - const char *desc; > - } funcs[] = { > - { "simple_lease", simple_lease, "Check if create lease ioctl call works" }, > - { "empty_lease", empty_lease, "Check that creating an empty lease works" }, > - { "lessee_list", lessee_list, "Check if listed lease is same as created one" }, > - { "lease_get", lease_get, "Tests getting the required contents of a lease" }, > - { "lease_unleased_connector", lease_unleased_connector, "Negative test by trying to" > - " use an unleased connector " }, > - { "lease_unleased_crtc", lease_unleased_crtc, "Negative test by trying to use an unleased crtc" }, > - { "lease_revoke", lease_revoke, "Tests revocation of lease" }, > - { "lease_again", lease_again, "Tests leasing objects more than once" }, > - { "lease_invalid_connector", lease_invalid_connector, "Tests leasing an invalid connector" }, > - { "lease_invalid_crtc", lease_invalid_crtc, "Tests leasing an invalid crtc" }, > - { "lease_invalid_plane", lease_invalid_plane, "Tests leasing an invalid plane" }, > - { "page_flip_implicit_plane", page_flip_implicit_plane, "Negative test by using a " > - "non-primary plane with the page flip ioctl" }, > - { "setcrtc_implicit_plane", setcrtc_implicit_plane, "Negative test by using a " > - "non-primary plane with the setcrtc ioctl" }, > - { "cursor_implicit_plane", cursor_implicit_plane, "Negative test by using a non-primary" > - " plane with setcursor ioctl" }, > - { "atomic_implicit_crtc", atomic_implicit_crtc, "Negative test by using a different" > - " crtc with atomic ioctl" }, > - { } > - }, *f; > - > igt_fixture { > data.master.fd = drm_open_driver_master(DRIVER_ANY); > kmstest_set_vt_graphics_mode(); > igt_display_require(display, data.master.fd); > } > > - for (f = funcs; f->name; f++) { > - > - igt_describe(f->desc); > - igt_subtest_with_dynamic_f("%s", f->name) { > - for_each_pipe_with_valid_output(display, data.pipe, output) { > - igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(data.pipe), > - igt_output_name(output)) { > - data.crtc_id = pipe_to_crtc_id(display, data.pipe); > - data.connector_id = output->id; > - data.plane_id = > - igt_pipe_get_plane_type(&data.master.display.pipes[data.pipe], > - DRM_PLANE_TYPE_PRIMARY)->drm_plane->plane_id; > - f->func(&data); > + /*Display dependent subtests*/ ---------^ Fix the single line comment style. > + igt_subtest_group { > + > + const struct { > + const char *name; > + void (*func)(data_t *); > + const char *desc; > + } funcs[] = { > + { "simple_lease", simple_lease, "Check if create lease ioctl call works" }, > + { "empty_lease", empty_lease, "Check that creating an empty lease works" }, > + { "lessee_list", lessee_list, "Check if listed lease is same as created one" }, > + { "lease_get", lease_get, "Tests getting the required contents of a lease" }, > + { "lease_unleased_connector", lease_unleased_connector, "Negative test by trying to" > + " use an unleased connector " }, > + { "lease_unleased_crtc", lease_unleased_crtc, "Negative test by trying to use an unleased crtc" }, > + { "lease_revoke", lease_revoke, "Tests revocation of lease" }, > + { "lease_again", lease_again, "Tests leasing objects more than once" }, > + { "lease_invalid_connector", lease_invalid_connector, "Tests leasing an invalid connector" }, > + { "lease_invalid_crtc", lease_invalid_crtc, "Tests leasing an invalid crtc" }, > + { "lease_invalid_plane", lease_invalid_plane, "Tests leasing an invalid plane" }, > + { "page_flip_implicit_plane", page_flip_implicit_plane, "Negative test by using a " > + "non-primary plane with the page flip ioctl" }, > + { "setcrtc_implicit_plane", setcrtc_implicit_plane, "Negative test by using a " > + "non-primary plane with the setcrtc ioctl" }, > + { "cursor_implicit_plane", cursor_implicit_plane, "Negative test by using a non-primary" > + " plane with setcursor ioctl" }, > + { "atomic_implicit_crtc", atomic_implicit_crtc, "Negative test by using a different" > + " crtc with atomic ioctl" }, > + { } > + }, *f; > + > + igt_fixture > + igt_display_require_output(display); > + > + for (f = funcs; f->name; f++) { > + > + igt_describe(f->desc); > + igt_subtest_with_dynamic_f("%s", f->name) { > + for_each_pipe_with_valid_output(display, data.pipe, output) { > + igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(data.pipe), > + igt_output_name(output)) { > + igt_display_reset(display); > + igt_display_commit(display); > + data.crtc_id = display->pipes[data.pipe].crtc_id; > + data.connector_id = output->id; > + data.plane_id = > + igt_pipe_get_plane_type(&data.master.display.pipes[data.pipe], > + DRM_PLANE_TYPE_PRIMARY)->drm_plane->plane_id; > + f->func(&data); Also, having igt_*require() & igt_*skip*() inside the dynamic subtest is not recommended. Instead, move these checks to before calling the igt_dynamic*(); > + } > } > } > } > } > > - igt_describe("Tests error handling while creating invalid corner-cases for " > - "create-lease ioctl"); > - igt_subtest("invalid-create-leases") > - invalid_create_leases(&data); > - > - igt_describe("Tests that possible_crtcs logically match between master and " > - "lease, and that the values are correctly renumbered on the lease side."); > - igt_subtest("possible-crtcs-filtering") > - possible_crtcs_filtering(&data); > - > - igt_describe("Tests the drop/set_master interactions."); > - igt_subtest("master-vs-lease") > - master_vs_lease(&data); > - > - igt_describe("Tests that the 2nd master can only create leases while being active " > - "master, and that leases on the first master don't prevent lease creation " > - "for the 2nd master."); > - igt_subtest("multimaster-lease") > - multimaster_lease(&data); > - > - igt_describe("Tests the implicitly added planes."); > - igt_subtest("implicit-plane-lease") > - implicit_plane_lease(&data); > - > - igt_describe("Tests all the uevent cases"); > - igt_subtest("lease-uevent") > - lease_uevent(&data); > + /*Non-Display dependent subtests*/ Display independent? - Bhanu > + igt_subtest_group { > + > + igt_describe("Tests error handling while creating invalid corner-cases for " > + "create-lease ioctl"); > + igt_subtest("invalid-create-leases") > + invalid_create_leases(&data); > + > + igt_describe("Tests that possible_crtcs logically match between master and " > + "lease, and that the values are correctly renumbered on the lease side."); > + igt_subtest("possible-crtcs-filtering") > + possible_crtcs_filtering(&data); > + > + igt_describe("Tests the drop/set_master interactions."); > + igt_subtest("master-vs-lease") > + master_vs_lease(&data); > + > + igt_describe("Tests that the 2nd master can only create leases while being active " > + "master, and that leases on the first master don't prevent lease creation " > + "for the 2nd master."); > + igt_subtest("multimaster-lease") > + multimaster_lease(&data); > + > + igt_describe("Tests the implicitly added planes."); > + igt_subtest("implicit-plane-lease") > + implicit_plane_lease(&data); > + > + igt_describe("Tests all the uevent cases"); > + igt_subtest("lease-uevent") > + lease_uevent(&data); > + } > + > + igt_fixture { > + igt_display_fini(display); > + close(data.master.fd); > + } > }