From 2eeed1b87d7d72d1bcfc51b2c6234679b19c644a Mon Sep 17 00:00:00 2001 From: Algea Cao Date: Wed, 12 Mar 2025 18:29:22 +0800 Subject: [PATCH] drm/rockchip: dw_hdmi: Fix hdmi does not switch seamlessly when hdr colorspace isn't bt2020 Even if colorspace of hdr video is not bt2020, it can be seamlessly switched to yuv422 10bit in scenarios where sink supports yuv422. Change-Id: Ieb2c9a3c17183349caa70d5a3ba07ccf1b14252a Signed-off-by: Algea Cao --- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index fc7fc9c77af1..2da90d89cf3c 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -2466,8 +2466,8 @@ dw_hdmi_rockchip_select_output(struct drm_connector_state *conn_state, *enc_out_encoding = V4L2_YCBCR_ENC_BT2020; yuv422_out = true; /* bt709 hdr output */ - } else if ((hdmi->colorimetry <= DRM_MODE_COLORIMETRY_BT2020_CYCC) && - (hdmi->colorimetry >= DRM_MODE_COLORIMETRY_BT2020_YCC) && + } else if (((hdmi->colorimetry <= DRM_MODE_COLORIMETRY_BT2020_CYCC) || + (hdmi->colorimetry >= DRM_MODE_COLORIMETRY_BT2020_YCC)) && (conn_state->connector->hdr_sink_metadata.hdmi_type1.eotf & BIT(*eotf) && *eotf > HDMI_EOTF_TRADITIONAL_GAMMA_SDR)) { *enc_out_encoding = V4L2_YCBCR_ENC_709;