From 438372dd2a5b166aef0ca9f97780dff191769a6b Mon Sep 17 00:00:00 2001 From: Zheng Yang Date: Fri, 13 Jul 2018 10:12:56 +0800 Subject: [PATCH] drm: rockchip: dw-hdmi: fix colorimetry bt2020 value To differentiate extend colorimetry and normal colorimetry, we add the offset HDMI_COLORIMETRY_EXTENDED in colorimetry property. It should use same value in dw_hdmi_rockchip_select_output. Change-Id: I13e10b6e8211e7a2634dbd4b6c5310bc129bfa8d Signed-off-by: Zheng Yang --- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index 3c59fb3e41e2..464126553610 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -58,6 +58,8 @@ #define RK3399_HDMI_LCDC_SEL BIT(6) #define HIWORD_UPDATE(val, mask) (val | (mask) << 16) +#define RK_HDMI_COLORIMETRY_BT2020 (HDMI_COLORIMETRY_EXTENDED + \ + HDMI_EXTENDED_COLORIMETRY_BT2020) /** * struct rockchip_hdmi_chip_data - splite the grf setting of kind of chips @@ -621,7 +623,7 @@ dw_hdmi_rockchip_select_output(struct drm_connector_state *conn_state, if ((*eotf > TRADITIONAL_GAMMA_HDR && conn_state->connector->hdr_sink_metadata.hdmi_type1.eotf & BIT(*eotf)) || (hdmi->colorimetry == - HDMI_EXTENDED_COLORIMETRY_BT2020 && info->hdmi.colorimetry & + RK_HDMI_COLORIMETRY_BT2020 && info->hdmi.colorimetry & (BIT(6) | BIT(7)))) *enc_out_encoding = V4L2_YCBCR_ENC_BT2020; else if ((vic == 6) || (vic == 7) || (vic == 21) || (vic == 22) || @@ -809,8 +811,7 @@ static const struct drm_prop_enum_list quant_range_enum_list[] = { static const struct drm_prop_enum_list colorimetry_enum_list[] = { { HDMI_COLORIMETRY_NONE, "None" }, - { HDMI_COLORIMETRY_EXTENDED + HDMI_EXTENDED_COLORIMETRY_BT2020, - "ITU_2020" }, + { RK_HDMI_COLORIMETRY_BT2020, "ITU_2020" }, }; static void