Commit 1bd1562d authored Dec 24, 2024 by Cristian Ciocaltea Committed by Dmitry Baryshkov Jan 13, 2025

drm/bridge-connector: Sync supported_formats with computed ycbcr_420_allowed

The case of having an HDMI bridge in the pipeline which advertises
YUV420 capability via its ->supported_formats and a non-HDMI one that
didn't enable ->ycbcr_420_allowed, is incorrectly handled because
supported_formats is passed as is to the helper initializing the HDMI
connector.

Ensure HDMI_COLORSPACE_YUV420 is removed from the bitmask passed to
drmm_connector_hdmi_init() when connector's ->ycbcr_420_allowed flag
ends up not being set.

Fixes: 3ced1c68 ("drm/display: bridge_connector: handle ycbcr_420_allowed")
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20241224-bridge-conn-fmt-prio-v4-2-a9ceb5671379@collabora.com

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

parent d102ac39

drivers/gpu/drm/display/drm_bridge_connector.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -459,7 +459,10 @@ 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 (bridge_connector->bridge_hdmi) {
		if (!connector->ycbcr_420_allowed)
		supported_formats &= ~BIT(HDMI_COLORSPACE_YUV420);

		ret = drmm_connector_hdmi_init(drm, connector,
		bridge_connector->bridge_hdmi->vendor,
		bridge_connector->bridge_hdmi->product,
		@@ -468,10 +471,11 @@ struct drm_connector drm_bridge_connector_init(struct drm_device drm,
		connector_type, ddc,
		supported_formats,
		max_bpc);
		else
		} else {
		ret = drmm_connector_init(drm, connector,
		&drm_bridge_connector_funcs,
		connector_type, ddc);
		}
		if (ret)
		return ERR_PTR(ret);