Message ID | 20190708112116.1780-4-ramalingam.c@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | HDCP2.2 Phase II | expand |
On Mon, Jul 08, 2019 at 04:51:13PM +0530, Ramalingam C wrote: > DRM API for generating uevent for a status changes of connector's > property. > > This uevent will have following details related to the status change: > > HOTPLUG=1, CONNECTOR=<connector_id> and PROPERTY=<property_id> > > Need ACK from this uevent from userspace consumer. > > v2: > Minor fixes at KDoc comments [Daniel] > v3: > Check the property is really attached with connector [Daniel] > > Signed-off-by: Ramalingam C <ramalingam.c@intel.com> > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/drm_sysfs.c | 35 +++++++++++++++++++++++++++++++++++ > include/drm/drm_sysfs.h | 5 ++++- > 2 files changed, 39 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c > index ad10810bc972..d13a77057045 100644 > --- a/drivers/gpu/drm/drm_sysfs.c > +++ b/drivers/gpu/drm/drm_sysfs.c > @@ -26,6 +26,7 @@ > #include <drm/drm_sysfs.h> > > #include "drm_internal.h" > +#include "drm_crtc_internal.h" > > #define to_drm_minor(d) dev_get_drvdata(d) > #define to_drm_connector(d) dev_get_drvdata(d) > @@ -325,6 +326,9 @@ void drm_sysfs_lease_event(struct drm_device *dev) > * Send a uevent for the DRM device specified by @dev. Currently we only > * set HOTPLUG=1 in the uevent environment, but this could be expanded to > * deal with other types of events. > + * > + * Any new uapi should be using the drm_sysfs_connector_status_event() > + * for uevents on connector status change. > */ > void drm_sysfs_hotplug_event(struct drm_device *dev) > { > @@ -337,6 +341,37 @@ void drm_sysfs_hotplug_event(struct drm_device *dev) > } > EXPORT_SYMBOL(drm_sysfs_hotplug_event); > > +/** > + * drm_sysfs_connector_status_event - generate a DRM uevent for connector > + * property status change > + * @connector: connector on which property status changed > + * @property: connector property whoes status changed. s/whoes/whose/ > + * > + * Send a uevent for the DRM device specified by @dev. Currently we > + * set HOTPLUG=1 and connector id along with the attached property id > + * related to the status change. > + */ > +void drm_sysfs_connector_status_event(struct drm_connector *connector, > + struct drm_property *property) > +{ > + struct drm_device *dev = connector->dev; > + char hotplug_str[] = "HOTPLUG=1", conn_id[30], prop_id[30]; 30 chars is a bit aggressive. UINT_MAX will only take up 10 chars, so with the NULL char, you should only need 21 for conn_id and 20 for prop_id. > + char *envp[4] = { hotplug_str, conn_id, prop_id, NULL }; > + > + WARN_ON(!drm_mode_obj_find_prop_id(&connector->base, > + property->base.id)); > + > + snprintf(conn_id, ARRAY_SIZE(conn_id), > + "CONNECTOR=%u", connector->base.id); > + snprintf(prop_id, ARRAY_SIZE(prop_id), > + "PROPERTY=%u", property->base.id); > + > + DRM_DEBUG("generating connector status event\n"); > + > + kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, envp); > +} > +EXPORT_SYMBOL(drm_sysfs_connector_status_event); With nits addressed, Reviewed-by: Sean Paul <sean@poorly.run> > + > static void drm_sysfs_release(struct device *dev) > { > kfree(dev); > diff --git a/include/drm/drm_sysfs.h b/include/drm/drm_sysfs.h > index 4f311e836cdc..d454ef617b2c 100644 > --- a/include/drm/drm_sysfs.h > +++ b/include/drm/drm_sysfs.h > @@ -4,10 +4,13 @@ > > struct drm_device; > struct device; > +struct drm_connector; > +struct drm_property; > > int drm_class_device_register(struct device *dev); > void drm_class_device_unregister(struct device *dev); > > void drm_sysfs_hotplug_event(struct drm_device *dev); > - > +void drm_sysfs_connector_status_event(struct drm_connector *connector, > + struct drm_property *property); > #endif > -- > 2.19.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index ad10810bc972..d13a77057045 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c @@ -26,6 +26,7 @@ #include <drm/drm_sysfs.h> #include "drm_internal.h" +#include "drm_crtc_internal.h" #define to_drm_minor(d) dev_get_drvdata(d) #define to_drm_connector(d) dev_get_drvdata(d) @@ -325,6 +326,9 @@ void drm_sysfs_lease_event(struct drm_device *dev) * Send a uevent for the DRM device specified by @dev. Currently we only * set HOTPLUG=1 in the uevent environment, but this could be expanded to * deal with other types of events. + * + * Any new uapi should be using the drm_sysfs_connector_status_event() + * for uevents on connector status change. */ void drm_sysfs_hotplug_event(struct drm_device *dev) { @@ -337,6 +341,37 @@ void drm_sysfs_hotplug_event(struct drm_device *dev) } EXPORT_SYMBOL(drm_sysfs_hotplug_event); +/** + * drm_sysfs_connector_status_event - generate a DRM uevent for connector + * property status change + * @connector: connector on which property status changed + * @property: connector property whoes status changed. + * + * Send a uevent for the DRM device specified by @dev. Currently we + * set HOTPLUG=1 and connector id along with the attached property id + * related to the status change. + */ +void drm_sysfs_connector_status_event(struct drm_connector *connector, + struct drm_property *property) +{ + struct drm_device *dev = connector->dev; + char hotplug_str[] = "HOTPLUG=1", conn_id[30], prop_id[30]; + char *envp[4] = { hotplug_str, conn_id, prop_id, NULL }; + + WARN_ON(!drm_mode_obj_find_prop_id(&connector->base, + property->base.id)); + + snprintf(conn_id, ARRAY_SIZE(conn_id), + "CONNECTOR=%u", connector->base.id); + snprintf(prop_id, ARRAY_SIZE(prop_id), + "PROPERTY=%u", property->base.id); + + DRM_DEBUG("generating connector status event\n"); + + kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, envp); +} +EXPORT_SYMBOL(drm_sysfs_connector_status_event); + static void drm_sysfs_release(struct device *dev) { kfree(dev); diff --git a/include/drm/drm_sysfs.h b/include/drm/drm_sysfs.h index 4f311e836cdc..d454ef617b2c 100644 --- a/include/drm/drm_sysfs.h +++ b/include/drm/drm_sysfs.h @@ -4,10 +4,13 @@ struct drm_device; struct device; +struct drm_connector; +struct drm_property; int drm_class_device_register(struct device *dev); void drm_class_device_unregister(struct device *dev); void drm_sysfs_hotplug_event(struct drm_device *dev); - +void drm_sysfs_connector_status_event(struct drm_connector *connector, + struct drm_property *property); #endif