From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3A89C89FE3 for ; Tue, 23 Jun 2020 11:57:52 +0000 (UTC) Date: Tue, 23 Jun 2020 17:28:03 +0530 From: Ramalingam C Message-ID: <20200623115803.GC31003@intel.com> References: <20200623103254.20921-1-ankit.k.nautiyal@intel.com> <20200623103254.20921-4-ankit.k.nautiyal@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200623103254.20921-4-ankit.k.nautiyal@intel.com> Subject: Re: [igt-dev] [Patch][i-g-t v2 3/3] lib: Use generic names for APIs that handle uevents List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: Ankit Nautiyal Cc: igt-dev@lists.freedesktop.org List-ID: On 2020-06-23 at 16:02:54 +0530, Ankit Nautiyal wrote: > The functions for handling uevents are named with "_hotplug" as suffix > such as igt_watch_hotplug(). Earlier hotplug was the only uevent that > was requested to be detected, but in fact, these APIs are generic and > can be used for detecting other uevents too. > > Currently we have tests like kms_lease, kms_content_protection using > the uevent handling infrastructure for detecting uevents other than > hotplug. > > This patch renames the functions and replace the "_hotplug" suffix > with "_uevents". > > Signed-off-by: Ankit Nautiyal Looks good to me. Reviewed-by: Ramalingam C > Suggested-by: Ramalingam C > Suggested-by: Hiler, Arkadiusz > --- > lib/igt_kms.c | 30 ++++++++++++------------- > lib/igt_kms.h | 6 ++--- > tests/kms_chamelium.c | 40 +++++++++++++++++----------------- > tests/kms_content_protection.c | 6 ++--- > tests/kms_lease.c | 6 ++--- > 5 files changed, 44 insertions(+), 44 deletions(-) > > diff --git a/lib/igt_kms.c b/lib/igt_kms.c > index a9c444e6..39f8c09a 100644 > --- a/lib/igt_kms.c > +++ b/lib/igt_kms.c > @@ -4125,13 +4125,13 @@ void igt_reset_connectors(void) > } > > /** > - * igt_watch_hotplug: > + * igt_watch_uevents: > * > - * Begin monitoring udev for sysfs hotplug events. > + * Begin monitoring udev for sysfs uevents. > * > - * Returns: a udev monitor for detecting hotplugs on > + * Returns: a udev monitor for detecting uevents on > */ > -struct udev_monitor *igt_watch_hotplug(void) > +struct udev_monitor *igt_watch_uevents(void) > { > struct udev *udev; > struct udev_monitor *mon; > @@ -4198,7 +4198,7 @@ static bool event_detected(struct udev_monitor *mon, int timeout_secs, > > /** > * igt_connector_event_detected: > - * @mon: A udev monitor initialized with #igt_watch_hotplug > + * @mon: A udev monitor initialized with #igt_watch_uevents > * @conn_id: Connector id of the Connector for which the property change is > * expected. > * @prop_id: Property id for which the change is expected. > @@ -4219,7 +4219,7 @@ bool igt_connector_event_detected(struct udev_monitor *mon, uint32_t conn_id, > > /** > * igt_hotplug_detected: > - * @mon: A udev monitor initialized with #igt_watch_hotplug > + * @mon: A udev monitor initialized with #igt_watch_uevents > * @timeout_secs: How long to wait for a hotplug event to occur. > * > * Assert that a hotplug event was received since we last checked the monitor. > @@ -4236,7 +4236,7 @@ bool igt_hotplug_detected(struct udev_monitor *mon, int timeout_secs) > > /** > * igt_lease_change_detected: > - * @mon: A udev monitor initialized with #igt_watch_hotplug > + * @mon: A udev monitor initialized with #igt_watch_uevents > * @timeout_secs: How long to wait for a lease change event to occur. > * > * Assert that a lease change event was received since we last checked the monitor. > @@ -4252,12 +4252,12 @@ bool igt_lease_change_detected(struct udev_monitor *mon, int timeout_secs) > } > > /** > - * igt_flush_hotplugs: > - * @mon: A udev monitor initialized with #igt_watch_hotplug > + * igt_flush_uevents: > + * @mon: A udev monitor initialized with #igt_watch_uevents > * > - * Get rid of any pending hotplug events > + * Get rid of any pending uevents > */ > -void igt_flush_hotplugs(struct udev_monitor *mon) > +void igt_flush_uevents(struct udev_monitor *mon) > { > struct udev_device *dev; > > @@ -4266,12 +4266,12 @@ void igt_flush_hotplugs(struct udev_monitor *mon) > } > > /** > - * igt_cleanup_hotplug: > - * @mon: A udev monitor initialized with #igt_watch_hotplug > + * igt_cleanup_uevents: > + * @mon: A udev monitor initialized with #igt_watch_uevents > * > - * Cleanup the resources allocated by #igt_watch_hotplug > + * Cleanup the resources allocated by #igt_watch_uevents > */ > -void igt_cleanup_hotplug(struct udev_monitor *mon) > +void igt_cleanup_uevents(struct udev_monitor *mon) > { > struct udev *udev = udev_monitor_get_udev(mon); > > diff --git a/lib/igt_kms.h b/lib/igt_kms.h > index 0b4d7c94..afa18406 100644 > --- a/lib/igt_kms.h > +++ b/lib/igt_kms.h > @@ -772,15 +772,15 @@ const struct edid *igt_kms_get_dp_audio_edid(void); > const struct edid *igt_kms_get_4k_edid(void); > const struct edid *igt_kms_get_3d_edid(void); > > -struct udev_monitor *igt_watch_hotplug(void); > +struct udev_monitor *igt_watch_uevents(void); > bool igt_hotplug_detected(struct udev_monitor *mon, > int timeout_secs); > bool igt_lease_change_detected(struct udev_monitor *mon, > int timeout_secs); > bool igt_connector_event_detected(struct udev_monitor *mon, uint32_t conn_id, > uint32_t prop_id, int timeout_msecs); > -void igt_flush_hotplugs(struct udev_monitor *mon); > -void igt_cleanup_hotplug(struct udev_monitor *mon); > +void igt_flush_uevents(struct udev_monitor *mon); > +void igt_cleanup_uevents(struct udev_monitor *mon); > > bool igt_display_has_format_mod(igt_display_t *display, uint32_t format, uint64_t modifier); > bool igt_plane_has_format_mod(igt_plane_t *plane, uint32_t format, uint64_t modifier); > diff --git a/tests/kms_chamelium.c b/tests/kms_chamelium.c > index 5c4a1892..2b63e075 100644 > --- a/tests/kms_chamelium.c > +++ b/tests/kms_chamelium.c > @@ -248,7 +248,7 @@ static const char test_basic_hotplug_desc[] = > static void > test_basic_hotplug(data_t *data, struct chamelium_port *port, int toggle_count) > { > - struct udev_monitor *mon = igt_watch_hotplug(); > + struct udev_monitor *mon = igt_watch_uevents(); > int i; > drmModeConnection status; > > @@ -256,7 +256,7 @@ test_basic_hotplug(data_t *data, struct chamelium_port *port, int toggle_count) > igt_hpd_storm_set_threshold(data->drm_fd, 0); > > for (i = 0; i < toggle_count; i++) { > - igt_flush_hotplugs(mon); > + igt_flush_uevents(mon); > > /* Check if we get a sysfs hotplug event */ > chamelium_plug(data->chamelium, port); > @@ -268,7 +268,7 @@ test_basic_hotplug(data_t *data, struct chamelium_port *port, int toggle_count) > "got %s, expected connected\n", > connection_str(status)); > > - igt_flush_hotplugs(mon); > + igt_flush_uevents(mon); > > /* Now check if we get a hotplug from disconnection */ > chamelium_unplug(data->chamelium, port); > @@ -281,7 +281,7 @@ test_basic_hotplug(data_t *data, struct chamelium_port *port, int toggle_count) > connection_str(status)); > } > > - igt_cleanup_hotplug(mon); > + igt_cleanup_uevents(mon); > igt_hpd_storm_reset(data->drm_fd); > } > > @@ -357,7 +357,7 @@ try_suspend_resume_hpd(data_t *data, struct chamelium_port *port, > int delay; > int p; > > - igt_flush_hotplugs(mon); > + igt_flush_uevents(mon); > > delay = igt_get_autoresume_delay(state) * 1000 / 2; > > @@ -413,7 +413,7 @@ test_suspend_resume_hpd(data_t *data, struct chamelium_port *port, > enum igt_suspend_state state, > enum igt_suspend_test test) > { > - struct udev_monitor *mon = igt_watch_hotplug(); > + struct udev_monitor *mon = igt_watch_uevents(); > > reset_state(data, port); > > @@ -423,7 +423,7 @@ test_suspend_resume_hpd(data_t *data, struct chamelium_port *port, > /* Now make sure we notice disconnected connectors after resuming */ > try_suspend_resume_hpd(data, port, state, test, mon, true); > > - igt_cleanup_hotplug(mon); > + igt_cleanup_uevents(mon); > } > > static const char test_suspend_resume_hpd_common_desc[] = > @@ -433,7 +433,7 @@ static void > test_suspend_resume_hpd_common(data_t *data, enum igt_suspend_state state, > enum igt_suspend_test test) > { > - struct udev_monitor *mon = igt_watch_hotplug(); > + struct udev_monitor *mon = igt_watch_uevents(); > struct chamelium_port *port; > int p; > > @@ -450,7 +450,7 @@ test_suspend_resume_hpd_common(data_t *data, enum igt_suspend_state state, > /* Now make sure we notice disconnected connectors after resuming */ > try_suspend_resume_hpd(data, NULL, state, test, mon, true); > > - igt_cleanup_hotplug(mon); > + igt_cleanup_uevents(mon); > } > > static const char test_suspend_resume_edid_change_desc[] = > @@ -464,7 +464,7 @@ test_suspend_resume_edid_change(data_t *data, struct chamelium_port *port, > enum test_edid edid, > enum test_edid alt_edid) > { > - struct udev_monitor *mon = igt_watch_hotplug(); > + struct udev_monitor *mon = igt_watch_uevents(); > bool link_status_failed[2][data->port_count]; > int p; > > @@ -472,7 +472,7 @@ test_suspend_resume_edid_change(data_t *data, struct chamelium_port *port, > > /* Catch the event and flush all remaining ones. */ > igt_assert(igt_hotplug_detected(mon, HOTPLUG_TIMEOUT)); > - igt_flush_hotplugs(mon); > + igt_flush_uevents(mon); > > /* First plug in the port */ > set_edid(data, port, edid); > @@ -489,7 +489,7 @@ test_suspend_resume_edid_change(data_t *data, struct chamelium_port *port, > > get_connectors_link_status_failed(data, link_status_failed[0]); > > - igt_flush_hotplugs(mon); > + igt_flush_uevents(mon); > > igt_system_suspend_autoresume(state, test); > igt_assert(igt_hotplug_detected(mon, HOTPLUG_TIMEOUT)); > @@ -659,7 +659,7 @@ test_link_status(data_t *data, struct chamelium_port *port) > memcpy(prev_modes, connector->modes, > prev_modes_len * sizeof(drmModeModeInfo)); > > - mon = igt_watch_hotplug(); > + mon = igt_watch_uevents(); > > while (1) { > if (link_status == DRM_MODE_LINK_STATUS_BAD) { > @@ -693,7 +693,7 @@ test_link_status(data_t *data, struct chamelium_port *port) > igt_assert_eq(reprobe_connector(data, port), > DRM_MODE_CONNECTED); > > - igt_flush_hotplugs(mon); > + igt_flush_uevents(mon); > > drmModeFreeConnector(connector); > connector = chamelium_port_get_connector(data->chamelium, port, > @@ -715,7 +715,7 @@ test_link_status(data_t *data, struct chamelium_port *port) > } > } > > - igt_cleanup_hotplug(mon); > + igt_cleanup_uevents(mon); > igt_remove_fb(data->drm_fd, &fb); > free(prev_modes); > drmModeFreeConnector(connector); > @@ -2518,10 +2518,10 @@ static const char test_hpd_without_ddc_desc[] = > static void > test_hpd_without_ddc(data_t *data, struct chamelium_port *port) > { > - struct udev_monitor *mon = igt_watch_hotplug(); > + struct udev_monitor *mon = igt_watch_uevents(); > > reset_state(data, port); > - igt_flush_hotplugs(mon); > + igt_flush_uevents(mon); > > /* Disable the DDC on the connector and make sure we still get a > * hotplug > @@ -2532,7 +2532,7 @@ test_hpd_without_ddc(data_t *data, struct chamelium_port *port) > igt_assert(igt_hotplug_detected(mon, HOTPLUG_TIMEOUT)); > igt_assert_eq(reprobe_connector(data, port), DRM_MODE_CONNECTED); > > - igt_cleanup_hotplug(mon); > + igt_cleanup_uevents(mon); > } > > static const char test_hpd_storm_detect_desc[] = > @@ -2552,7 +2552,7 @@ test_hpd_storm_detect(data_t *data, struct chamelium_port *port, int width) > chamelium_fire_hpd_pulses(data->chamelium, port, width, 10); > igt_assert(igt_hpd_storm_detected(data->drm_fd)); > > - mon = igt_watch_hotplug(); > + mon = igt_watch_uevents(); > chamelium_fire_hpd_pulses(data->chamelium, port, width, 10); > > /* > @@ -2563,7 +2563,7 @@ test_hpd_storm_detect(data_t *data, struct chamelium_port *port, int width) > count += igt_hotplug_detected(mon, 1); > igt_assert_lt(count, 2); > > - igt_cleanup_hotplug(mon); > + igt_cleanup_uevents(mon); > igt_hpd_storm_reset(data->drm_fd); > } > > diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c > index a80aa5bb..303ed418 100644 > --- a/tests/kms_content_protection.c > +++ b/tests/kms_content_protection.c > @@ -567,10 +567,10 @@ igt_main > igt_subtest("uevent") { > igt_require(data.display.is_atomic); > data.cp_tests = CP_UEVENT; > - data.uevent_monitor = igt_watch_hotplug(); > - igt_flush_hotplugs(data.uevent_monitor); > + data.uevent_monitor = igt_watch_uevents(); > + igt_flush_uevents(data.uevent_monitor); > test_content_protection(COMMIT_ATOMIC, HDCP_CONTENT_TYPE_0); > - igt_cleanup_hotplug(data.uevent_monitor); > + igt_cleanup_uevents(data.uevent_monitor); > } > > /* > diff --git a/tests/kms_lease.c b/tests/kms_lease.c > index 927c2315..2e6cf9b0 100644 > --- a/tests/kms_lease.c > +++ b/tests/kms_lease.c > @@ -1238,9 +1238,9 @@ static void lease_uevent(data_t *data) > struct local_drm_mode_list_lessees mll; > struct udev_monitor *uevent_monitor; > > - uevent_monitor = igt_watch_hotplug(); > + uevent_monitor = igt_watch_uevents(); > > - igt_flush_hotplugs(uevent_monitor); > + igt_flush_uevents(uevent_monitor); > > lease_fd = create_simple_lease(data->master.fd, data); > > @@ -1260,7 +1260,7 @@ static void lease_uevent(data_t *data) > igt_assert_eq(list_lessees(data->master.fd, &mll), 0); > igt_assert_eq(mll.count_lessees, 0); > > - igt_cleanup_hotplug(uevent_monitor); > + igt_cleanup_uevents(uevent_monitor); > } > > igt_main > -- > 2.17.1 > _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev