On Friday, 27 February 2026 14:59:58 Central European Standard Time Maxime
Ripard wrote:
> The hdmi_colorspace enum was defined to represent the colorspace value
> of the HDMI infoframes. It was later used by some HDMI drivers to
> express the output format they should be setting up.
>
> During the introduction of the HDMI helpers, it then was used to
> represent it in the drm_connector_hdmi_state structure.
>
> However, it's always been somewhat redundant with the DRM_COLOR_FORMAT_*
> defines, and now with the drm_output_color_format enum. Let's
> consolidate around drm_output_color_format in drm_connector_hdmi_state
> to facilitate the current effort to provide a global output format
> selection mechanism.
>
> Acked-by: Jani Nikula <[email protected]>
> Signed-off-by: Maxime Ripard <[email protected]>
> ---
> drivers/gpu/drm/bridge/inno-hdmi.c | 6 +-
> drivers/gpu/drm/bridge/ite-it6263.c | 2 +-
> drivers/gpu/drm/display/drm_bridge_connector.c | 4 +-
> drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +-
> drivers/gpu/drm/display/drm_hdmi_state_helper.c | 52 ++++--
> drivers/gpu/drm/drm_bridge.c | 2 +-
> drivers/gpu/drm/drm_connector.c | 14 +-
> drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +-
> drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
> drivers/gpu/drm/tests/drm_connector_test.c | 80 ++++-----
> drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182
> ++++++++++-----------
> drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +-
> drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +-
> include/drm/bridge/dw_hdmi_qp.h | 2 +-
> include/drm/display/drm_hdmi_helper.h | 3 +-
> include/drm/drm_connector.h | 7 +-
> 16 files changed, 208 insertions(+), 183 deletions(-)
>
> [... snip ...]
> diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c
> b/drivers/gpu/drm/display/drm_bridge_connector.c
> index
> f686aa5c0ed9b84dbe5e0957df22d08aff2f1945..39cc18f78eda11ba35954f75315f646c0cb0d8e6
> 100644
> --- a/drivers/gpu/drm/display/drm_bridge_connector.c
> +++ b/drivers/gpu/drm/display/drm_bridge_connector.c
> @@ -787,11 +787,11 @@ struct drm_connector *drm_bridge_connector_init(struct
> drm_device *drm,
> {
> struct drm_bridge_connector *bridge_connector;
> struct drm_connector *connector;
> struct i2c_adapter *ddc = NULL;
> struct drm_bridge *panel_bridge __free(drm_bridge_put) = NULL;
> - unsigned int supported_formats = BIT(HDMI_COLORSPACE_RGB);
> + unsigned int supported_formats = BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444);
> unsigned int max_bpc = 8;
> bool support_hdcp = false;
> int connector_type;
> int ret;
Just noticed that we definitely also need to adjust the comment in
drm_bridge.h for drm_bridge::supported_formats. It still claims
it's a bitfield of HDMI_COLORSPACE_* values, but in this function,
gets assigned DRM_OUTPUT_COLOR_FORMAT values now.
Kind regards,
Nicolas Frattaroli
>
> @@ -958,11 +958,11 @@ struct drm_connector *drm_bridge_connector_init(struct
> drm_device *drm,
> if (connector_type == DRM_MODE_CONNECTOR_Unknown)
> return ERR_PTR(-EINVAL);
>
> if (bridge_connector->bridge_hdmi) {
> if (!connector->ycbcr_420_allowed)
> - supported_formats &= ~BIT(HDMI_COLORSPACE_YUV420);
> + supported_formats &=
> ~BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420);
>
> bridge_connector->hdmi_funcs = drm_bridge_connector_hdmi_funcs;
>
> if (bridge_connector->bridge_hdmi->ops &
> DRM_BRIDGE_OP_HDMI_AUDIO)
> bridge_connector->hdmi_funcs.audio =
> [... snip ...]
