Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/sysfs: rename drm_sysfs_connector_status_event()

Browse Source 
Rename drm_sysfs_connector_status_event() to
drm_sysfs_connector_property_event(). Indeed, "status" is a bit
vague: it can easily be confused with the connected/disconnected
status of the connector. This function has nothing to do with
connected/disconnected: it merely sends a notification that a
connector's property has changed (e.g. HDCP, privacy screen, etc).

Signed-off-by: Simon Ser <contact@emersion.fr>
Cc: Manasi Navare <navaremanasi@chromium.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230620174231.260335-1-contact@emersion.fr
This commit is contained in:
Simon Ser 2023-06-20 17:42:42 +00:00
parent 3fe630c771
commit 0cf8d292ba
4 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/display/drm_hdcp_helper.c
View File

@ -415,7 +415,7 @@ void drm_hdcp_update_content_protection(struct drm_connector *connector,
return; return;
state->content_protection = val; state->content_protection = val;
drm_sysfs_connector_status_event(connector, drm_sysfs_connector_property_event(connector,
dev->mode_config.content_protection_property); dev->mode_config.content_protection_property);
} }
EXPORT_SYMBOL(drm_hdcp_update_content_protection); EXPORT_SYMBOL(drm_hdcp_update_content_protection);

8
drivers/gpu/drm/drm_connector.c
View File

@ -2730,10 +2730,10 @@ static int drm_connector_privacy_screen_notifier(
drm_connector_update_privacy_screen_properties(connector, true); drm_connector_update_privacy_screen_properties(connector, true);
drm_modeset_unlock(&dev->mode_config.connection_mutex); drm_modeset_unlock(&dev->mode_config.connection_mutex);
drm_sysfs_connector_status_event(connector, drm_sysfs_connector_property_event(connector,
connector->privacy_screen_sw_state_property); connector->privacy_screen_sw_state_property);
drm_sysfs_connector_status_event(connector, drm_sysfs_connector_property_event(connector,
connector->privacy_screen_hw_state_property); connector->privacy_screen_hw_state_property);
return NOTIFY_DONE; return NOTIFY_DONE;
} }

23
drivers/gpu/drm/drm_sysfs.c
View File

@ -487,17 +487,17 @@ void drm_sysfs_connector_hotplug_event(struct drm_connector *connector)
EXPORT_SYMBOL(drm_sysfs_connector_hotplug_event); EXPORT_SYMBOL(drm_sysfs_connector_hotplug_event);
/** /**
* drm_sysfs_connector_status_event - generate a DRM uevent for connector * drm_sysfs_connector_property_event - generate a DRM uevent for connector
* property status change * property change
* @connector: connector on which property status changed * @connector: connector on which property changed
* @property: connector property whose status changed. * @property: connector property which has changed.
* *
* Send a uevent for the DRM device specified by @dev. Currently we * Send a uevent for the specified DRM connector and property. Currently we
* set HOTPLUG=1 and connector id along with the attached property id * set HOTPLUG=1 and connector id along with the attached property id
* related to the status change. * related to the change.
*/ */
void drm_sysfs_connector_status_event(struct drm_connector *connector, void drm_sysfs_connector_property_event(struct drm_connector *connector,
struct drm_property *property) struct drm_property *property)
{ {
struct drm_device *dev = connector->dev; struct drm_device *dev = connector->dev;
char hotplug_str[] = "HOTPLUG=1", conn_id[21], prop_id[21]; char hotplug_str[] = "HOTPLUG=1", conn_id[21], prop_id[21];
@ -511,11 +511,14 @@ void drm_sysfs_connector_status_event(struct drm_connector *connector,
snprintf(prop_id, ARRAY_SIZE(prop_id), snprintf(prop_id, ARRAY_SIZE(prop_id),
"PROPERTY=%u", property->base.id); "PROPERTY=%u", property->base.id);
DRM_DEBUG("generating connector status event\n"); drm_dbg_kms(connector->dev,
"[CONNECTOR:%d:%s] generating connector property event for [PROP:%d:%s]\n",
connector->base.id, connector->name,
property->base.id, property->name);
kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, envp); kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, envp);
} }
EXPORT_SYMBOL(drm_sysfs_connector_status_event); EXPORT_SYMBOL(drm_sysfs_connector_property_event);
struct device *drm_sysfs_minor_alloc(struct drm_minor *minor) struct device *drm_sysfs_minor_alloc(struct drm_minor *minor)
{ {

4
include/drm/drm_sysfs.h
View File

@ -12,6 +12,6 @@ void drm_class_device_unregister(struct device *dev);
void drm_sysfs_hotplug_event(struct drm_device *dev); void drm_sysfs_hotplug_event(struct drm_device *dev);
void drm_sysfs_connector_hotplug_event(struct drm_connector *connector); void drm_sysfs_connector_hotplug_event(struct drm_connector *connector);
void drm_sysfs_connector_status_event(struct drm_connector *connector, void drm_sysfs_connector_property_event(struct drm_connector *connector,
struct drm_property *property); struct drm_property *property);
#endif #endif