From d51a8b4d499363b9da5145584cd9843c095ea9ea Mon Sep 17 00:00:00 2001 From: Zheng Yang Date: Thu, 14 Sep 2017 10:37:37 +0800 Subject: [PATCH] drm: rockchip: hdmi: attach HDR_SOURCE_METADATA property HDR_SOURCE_METADATA property is used to set source hdr metadata, which will be sent to sink though HDMI DRM infoframe. Change-Id: If3500cb505c16c2f0caf66b8e64b4d80b93b228f Signed-off-by: Zheng Yang --- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index d2f8e0f1b665..7d999ceed6d6 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -782,6 +782,10 @@ dw_hdmi_rockchip_attach_properties(struct drm_connector *connector, hdmi->quant_range = prop; drm_object_attach_property(&connector->base, prop, 0); } + + prop = connector->dev->mode_config.hdr_output_metadata_property; + if (version >= 0x211a) + drm_object_attach_property(&connector->base, prop, 0); } static void @@ -829,6 +833,7 @@ dw_hdmi_rockchip_set_property(struct drm_connector *connector, void *data) { struct rockchip_hdmi *hdmi = (struct rockchip_hdmi *)data; + struct drm_mode_config *config = &connector->dev->mode_config; if (property == hdmi->color_depth_property) { hdmi->colordepth = val; @@ -839,6 +844,8 @@ dw_hdmi_rockchip_set_property(struct drm_connector *connector, } else if (property == hdmi->quant_range) { hdmi->hdmi_quant_range = val; return 0; + } else if (property == config->hdr_output_metadata_property) { + return 0; } DRM_ERROR("failed to set rockchip hdmi connector property\n"); @@ -854,6 +861,7 @@ dw_hdmi_rockchip_get_property(struct drm_connector *connector, { struct rockchip_hdmi *hdmi = (struct rockchip_hdmi *)data; struct drm_display_info *info = &connector->display_info; + struct drm_mode_config *config = &connector->dev->mode_config; if (property == hdmi->color_depth_property) { *val = hdmi->colordepth; @@ -892,6 +900,10 @@ dw_hdmi_rockchip_get_property(struct drm_connector *connector, } else if (property == hdmi->quant_range) { *val = hdmi->hdmi_quant_range; return 0; + } else if (property == config->hdr_output_metadata_property) { + *val = state->hdr_output_metadata ? + state->hdr_output_metadata->base.id : 0; + return 0; } DRM_ERROR("failed to get rockchip hdmi connector property\n");