shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm: rockchip: dw-hdmi: fix colorimetry bt2020 value

Browse Source 
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 <zhengyang@rock-chips.com>
This commit is contained in:
Zheng Yang
2018-07-13 10:12:56 +08:00
committed by Algea Cao
parent b6c3d16103
commit 438372dd2a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
View File

@@ -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