Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/sysfs: rename drm_sysfs_connector_status_event()

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

+21 -18
+2 -2
drivers/gpu/drm/display/drm_hdcp_helper.c
··· 415 415 return; 416 416 417 417 state->content_protection = val; 418 - drm_sysfs_connector_status_event(connector, 419 - dev->mode_config.content_protection_property); 418 + drm_sysfs_connector_property_event(connector, 419 + dev->mode_config.content_protection_property); 420 420 } 421 421 EXPORT_SYMBOL(drm_hdcp_update_content_protection);
+4 -4
drivers/gpu/drm/drm_connector.c
··· 2730 2730 drm_connector_update_privacy_screen_properties(connector, true); 2731 2731 drm_modeset_unlock(&dev->mode_config.connection_mutex); 2732 2732 2733 - drm_sysfs_connector_status_event(connector, 2734 - connector->privacy_screen_sw_state_property); 2735 - drm_sysfs_connector_status_event(connector, 2736 - connector->privacy_screen_hw_state_property); 2733 + drm_sysfs_connector_property_event(connector, 2734 + connector->privacy_screen_sw_state_property); 2735 + drm_sysfs_connector_property_event(connector, 2736 + connector->privacy_screen_hw_state_property); 2737 2737 2738 2738 return NOTIFY_DONE; 2739 2739 }
+13 -10
drivers/gpu/drm/drm_sysfs.c
··· 487 487 EXPORT_SYMBOL(drm_sysfs_connector_hotplug_event); 488 488 489 489 /** 490 - * drm_sysfs_connector_status_event - generate a DRM uevent for connector 491 - * property status change 492 - * @connector: connector on which property status changed 493 - * @property: connector property whose status changed. 490 + * drm_sysfs_connector_property_event - generate a DRM uevent for connector 491 + * property change 492 + * @connector: connector on which property changed 493 + * @property: connector property which has changed. 494 494 * 495 - * Send a uevent for the DRM device specified by @dev. Currently we 495 + * Send a uevent for the specified DRM connector and property. Currently we 496 496 * set HOTPLUG=1 and connector id along with the attached property id 497 - * related to the status change. 497 + * related to the change. 498 498 */ 499 - void drm_sysfs_connector_status_event(struct drm_connector *connector, 500 - struct drm_property *property) 499 + void drm_sysfs_connector_property_event(struct drm_connector *connector, 500 + struct drm_property *property) 501 501 { 502 502 struct drm_device *dev = connector->dev; 503 503 char hotplug_str[] = "HOTPLUG=1", conn_id[21], prop_id[21]; ··· 511 511 snprintf(prop_id, ARRAY_SIZE(prop_id), 512 512 "PROPERTY=%u", property->base.id); 513 513 514 - DRM_DEBUG("generating connector status event\n"); 514 + drm_dbg_kms(connector->dev, 515 + "[CONNECTOR:%d:%s] generating connector property event for [PROP:%d:%s]\n", 516 + connector->base.id, connector->name, 517 + property->base.id, property->name); 515 518 516 519 kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, envp); 517 520 } 518 - EXPORT_SYMBOL(drm_sysfs_connector_status_event); 521 + EXPORT_SYMBOL(drm_sysfs_connector_property_event); 519 522 520 523 struct device *drm_sysfs_minor_alloc(struct drm_minor *minor) 521 524 {
+2 -2
include/drm/drm_sysfs.h
··· 12 12 13 13 void drm_sysfs_hotplug_event(struct drm_device *dev); 14 14 void drm_sysfs_connector_hotplug_event(struct drm_connector *connector); 15 - void drm_sysfs_connector_status_event(struct drm_connector *connector, 16 - struct drm_property *property); 15 + void drm_sysfs_connector_property_event(struct drm_connector *connector, 16 + struct drm_property *property); 17 17 #endif