From 8f1f6dcb73dbc0db1f2efefad83f7f078c092b4f Mon Sep 17 00:00:00 2001 From: Algea Cao Date: Thu, 27 Jan 2022 09:38:27 +0800 Subject: [PATCH] drm/rockchip: dw_hdmi: Set connector id value Signed-off-by: Algea Cao Change-Id: I5f2477e14f039a88f5aea87d86a64cc4f6ed6cf1 --- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index 08941dccecfb..8228a6657982 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -2289,7 +2289,7 @@ dw_hdmi_rockchip_attach_properties(struct drm_connector *connector, prop = connector->dev->mode_config.hdr_output_metadata_property; if (version >= 0x211a || hdmi->is_hdmi_qp) drm_object_attach_property(&connector->base, prop, 0); - drm_object_attach_property(&connector->base, private->connector_id_prop, 0); + drm_object_attach_property(&connector->base, private->connector_id_prop, hdmi->id); } static void @@ -2420,7 +2420,6 @@ 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; - struct rockchip_drm_private *private = connector->dev->dev_private; if (property == hdmi->color_depth_property) { *val = hdmi->colordepth; @@ -2466,9 +2465,6 @@ dw_hdmi_rockchip_get_property(struct drm_connector *connector, } else if (property == hdmi->colorimetry_property) { *val = hdmi->colorimetry; return 0; - } else if (property == private->connector_id_prop) { - *val = hdmi->id; - return 0; } else if (property == hdmi->output_hdmi_dvi) { *val = hdmi->force_output; return 0;