From 4d1bfde6c617e1aca6efbda3df8c4da213a0217c Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Wed, 1 Jul 2020 17:34:57 +0800 Subject: [PATCH] drm/bridge: synopsys: dw-hdmi: update for remove connector port Change-Id: Ia0ca8c2fddf89f29bf4ac5703d8f4d0f68d6446a Signed-off-by: Sandy Huang --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 4 ++-- include/drm/bridge/dw_hdmi.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 9b3452103fcf..e2f3f674563b 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -2940,7 +2940,6 @@ static int dw_hdmi_bridge_attach(struct drm_bridge *bridge) connector->interlace_allowed = 1; connector->polled = DRM_CONNECTOR_POLL_HPD; - connector->port = hdmi->dev->of_node; drm_connector_helper_add(connector, &dw_hdmi_connector_helper_funcs); drm_connector_init(bridge->dev, connector, &dw_hdmi_connector_funcs, @@ -3982,7 +3981,7 @@ EXPORT_SYMBOL_GPL(dw_hdmi_remove); */ struct dw_hdmi *dw_hdmi_bind(struct platform_device *pdev, struct drm_encoder *encoder, - const struct dw_hdmi_plat_data *plat_data) + struct dw_hdmi_plat_data *plat_data) { struct dw_hdmi *hdmi; int ret; @@ -3997,6 +3996,7 @@ struct dw_hdmi *dw_hdmi_bind(struct platform_device *pdev, DRM_ERROR("Failed to initialize bridge with drm\n"); return ERR_PTR(ret); } + plat_data->connector = &hdmi->connector; return hdmi; } diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h index f4c2ba072d31..d7fde7dfe0ba 100644 --- a/include/drm/bridge/dw_hdmi.h +++ b/include/drm/bridge/dw_hdmi.h @@ -179,6 +179,7 @@ struct dw_hdmi_plat_data { /* Vendor Property support */ const struct dw_hdmi_property_ops *property_ops; + struct drm_connector *connector; }; struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev, @@ -187,7 +188,7 @@ void dw_hdmi_remove(struct dw_hdmi *hdmi); void dw_hdmi_unbind(struct dw_hdmi *hdmi); struct dw_hdmi *dw_hdmi_bind(struct platform_device *pdev, struct drm_encoder *encoder, - const struct dw_hdmi_plat_data *plat_data); + struct dw_hdmi_plat_data *plat_data); void dw_hdmi_suspend(struct device *dev, struct dw_hdmi *hdmi); void dw_hdmi_resume(struct device *dev, struct dw_hdmi *hdmi);