Display drivers may degrade from higher bit depths to lower bit depths for reasons such as bandwidth constraints. Userspace applications, such as compositors, may wish to know that this has occurred transparently, instead of assuming that the "max bpc" they requested could be reached.
Introduce a new immutable DRM property called "link bpc" that reflects the current display link's bits-per-component. An uevent is fired when the link bpc value changes. Set the new link_bpc member in the HDMI state helper to its HDMI output bpc, so that during the next commit, the property is updated accordingly and the uevent is fired. Co-developed-by: Derek Foreman <[email protected]> Signed-off-by: Derek Foreman <[email protected]> Co-developed-by: Marius Vlad <[email protected]> Signed-off-by: Marius Vlad <[email protected]> Signed-off-by: Nicolas Frattaroli <[email protected]> --- drivers/gpu/drm/display/drm_hdmi_state_helper.c | 2 + drivers/gpu/drm/drm_atomic_helper.c | 9 +++ drivers/gpu/drm/drm_atomic_uapi.c | 2 + drivers/gpu/drm/drm_connector.c | 86 +++++++++++++++++++++++++ include/drm/drm_connector.h | 16 +++++ 5 files changed, 115 insertions(+) diff --git a/drivers/gpu/drm/display/drm_hdmi_state_helper.c b/drivers/gpu/drm/display/drm_hdmi_state_helper.c index a1d16762ac7a..40648574f5e5 100644 --- a/drivers/gpu/drm/display/drm_hdmi_state_helper.c +++ b/drivers/gpu/drm/display/drm_hdmi_state_helper.c @@ -865,6 +865,8 @@ int drm_atomic_helper_connector_hdmi_check(struct drm_connector *connector, struct drm_crtc *crtc = new_conn_state->crtc; struct drm_crtc_state *crtc_state; + new_conn_state->link_bpc = new_conn_state->hdmi.output_bpc; + crtc_state = drm_atomic_get_crtc_state(state, crtc); if (IS_ERR(crtc_state)) return PTR_ERR(crtc_state); diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 26953ed6b53e..4a932f543ac7 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -2033,9 +2033,11 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_tail_rpm); static void commit_tail(struct drm_atomic_state *state) { + struct drm_connector_state *old_conn_state, *new_conn_state; struct drm_device *dev = state->dev; const struct drm_mode_config_helper_funcs *funcs; struct drm_crtc_state *new_crtc_state; + struct drm_connector *connector; struct drm_crtc *crtc; ktime_t start; s64 commit_time_ms; @@ -2059,6 +2061,13 @@ static void commit_tail(struct drm_atomic_state *state) drm_atomic_helper_wait_for_dependencies(state); + for_each_oldnew_connector_in_state(state, connector, old_conn_state, + new_conn_state, i) { + if (old_conn_state->link_bpc != new_conn_state->link_bpc) + drm_connector_update_link_bpc_property(connector, + new_conn_state); + } + /* * We cannot safely access new_crtc_state after * drm_atomic_helper_commit_hw_done() so figure out which crtc's have diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index 87de41fb4459..3e8b4b795512 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -1016,6 +1016,8 @@ drm_atomic_connector_get_property(struct drm_connector *connector, *val = state->privacy_screen_sw_state; } else if (property == connector->broadcast_rgb_property) { *val = state->hdmi.broadcast_rgb; + } else if (property == connector->link_bpc_property) { + *val = state->link_bpc; } else if (connector->funcs->atomic_get_property) { return connector->funcs->atomic_get_property(connector, state, property, val); diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index e70699c59c43..572894dad4bf 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -542,6 +542,75 @@ int drmm_connector_init(struct drm_device *dev, } EXPORT_SYMBOL(drmm_connector_init); +/** + * drm_connector_attach_link_bpc_property - create and attach 'link bpc' property + * @connector: drm connector + * @max_bpc: specify the upper limit, matching that of 'max bpc' property + * + * Create and attach the 'link bpc' DRM property on @connector with an upper + * limit of @max_bpc. + * + * Returns: + * 0 on success, negative errno on failure. + */ +int +drm_connector_attach_link_bpc_property(struct drm_connector *connector, + unsigned int max_bpc) +{ + struct drm_device *dev = connector->dev; + struct drm_property *prop; + + if (connector->link_bpc_property) + return -EBUSY; + + if (max_bpc < 8 || max_bpc > U8_MAX) + return -EINVAL; + + prop = drm_property_create_range(dev, DRM_MODE_PROP_IMMUTABLE, + "link bpc", 8, max_bpc); + if (!prop) + return -ENOMEM; + + connector->link_bpc_property = prop; + + drm_object_attach_property(&connector->base, prop, max_bpc); + + return 0; +} +EXPORT_SYMBOL(drm_connector_attach_link_bpc_property); + +/** + * drm_connector_update_link_bpc_property - update the 'link bpc' property of a + * connector and fire uevent + * @connector: pointer to the &struct drm_connector + * @state: pointer to the &struct drm_connector_state with the new value + * + * Update the 'link bpc' property of the given @connector to the + * &drm_connector_state.link_bpc member's value of @state and fire a uevent. + */ +void +drm_connector_update_link_bpc_property(struct drm_connector *connector, + struct drm_connector_state *state) +{ + u8 bpc = clamp(state->link_bpc, 8, state->max_bpc); + + if (!connector->link_bpc_property) + return; + + if (bpc != state->link_bpc) + drm_dbg_kms(connector->dev, "[CONNECTOR:%d:%s] Clamping link bpc from %u to %u\n", + connector->base.id, connector->name, state->link_bpc, bpc); + + drm_dbg_kms(connector->dev, "[CONNECTOR:%d:%s] Setting state link bpc %u\n", + connector->base.id, connector->name, bpc); + drm_object_property_set_value(&connector->base, connector->link_bpc_property, + bpc); + + drm_sysfs_connector_property_event(connector, + connector->link_bpc_property); +} +EXPORT_SYMBOL(drm_connector_update_link_bpc_property); + /** * drmm_connector_hdmi_init - Init a preallocated HDMI connector * @dev: DRM device @@ -624,6 +693,10 @@ int drmm_connector_hdmi_init(struct drm_device *dev, drm_connector_attach_max_bpc_property(connector, 8, max_bpc); connector->max_bpc = max_bpc; + ret = drm_connector_attach_link_bpc_property(connector, max_bpc); + if (ret) + return ret; + if (max_bpc > 8) drm_connector_attach_hdr_output_metadata_property(connector); @@ -1713,6 +1786,19 @@ EXPORT_SYMBOL(drm_hdmi_connector_get_output_format_name); * drm_connector_attach_max_bpc_property() to create and attach the * property to the connector during initialization. * + * link bpc: + * This immutable range property can be used by userspace to determine the + * current display link's bit depth. Drivers can use + * drm_connector_attach_link_bpc_property() to create and attach the + * property to the connector during initialization. They can then set the + * &drm_connector_state.link_bpc member to the actual output bit depth + * after any degradation. The drm property will be updated to this member's + * value on the next atomic commit, and if it changed, a uevent will be + * fired. + * Userspace can listen to the uevent to be notified of link bpc changes, + * and compare the property's value to what userspace requested to + * determine whether colour depth has been degraded. + * * Connectors also have one standardized atomic property: * * CRTC_ID: diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index c18be8c19de0..3c339a9840c9 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1132,6 +1132,11 @@ struct drm_connector_state { */ u8 max_bpc; + /** + * @link_bpc: Current display link's bits-per-component. + */ + u8 link_bpc; + /** * @privacy_screen_sw_state: See :ref:`Standard Connector * Properties<standard_connector_properties>` @@ -2124,6 +2129,12 @@ struct drm_connector { */ struct drm_property *max_bpc_property; + /** + * @link_bpc_property: Connector property that reflects the current + * output bits per component. + */ + struct drm_property *link_bpc_property; + /** @privacy_screen: drm_privacy_screen for this connector, or NULL. */ struct drm_privacy_screen *privacy_screen; @@ -2534,6 +2545,11 @@ void drm_connector_attach_privacy_screen_provider( struct drm_connector *connector, struct drm_privacy_screen *priv); void drm_connector_update_privacy_screen(const struct drm_connector_state *connector_state); +int drm_connector_attach_link_bpc_property(struct drm_connector *connector, + unsigned int max_bpc); +void drm_connector_update_link_bpc_property(struct drm_connector *connector, + struct drm_connector_state *state); + /** * struct drm_tile_group - Tile group metadata * @refcount: reference count -- 2.53.0
