[PATCH v5 05/24] drm: rockchip: Provide ddc symlink in inno_hdmi sysfs directory

[Andrzej Pietrasiewicz]

Use the ddc pointer provided by the generic connector.

Signed-off-by: Andrzej Pietrasiewicz <andrze...@collabora.com>
---
 drivers/gpu/drm/rockchip/inno_hdmi.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c 
b/drivers/gpu/drm/rockchip/inno_hdmi.c
index ed344a795b4d..0f7ed664600f 100644
--- a/drivers/gpu/drm/rockchip/inno_hdmi.c
+++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
@@ -58,7 +58,6 @@ struct inno_hdmi {
        struct drm_encoder      encoder;
 
        struct inno_hdmi_i2c *i2c;
-       struct i2c_adapter *ddc;
 
        unsigned int tmds_rate;
 
@@ -551,10 +550,10 @@ static int inno_hdmi_connector_get_modes(struct 
drm_connector *connector)
        struct edid *edid;
        int ret = 0;
 
-       if (!hdmi->ddc)
+       if (!hdmi->connector.ddc)
                return 0;
 
-       edid = drm_get_edid(connector, hdmi->ddc);
+       edid = drm_get_edid(connector, hdmi->connector.ddc);
        if (edid) {
                hdmi->hdmi_data.sink_is_hdmi = drm_detect_hdmi_monitor(edid);
                hdmi->hdmi_data.sink_has_audio = drm_detect_monitor_audio(edid);
@@ -624,8 +623,10 @@ static int inno_hdmi_register(struct drm_device *drm, 
struct inno_hdmi *hdmi)
 
        drm_connector_helper_add(&hdmi->connector,
                                 &inno_hdmi_connector_helper_funcs);
-       drm_connector_init(drm, &hdmi->connector, &inno_hdmi_connector_funcs,
-                          DRM_MODE_CONNECTOR_HDMIA);
+       drm_connector_init_with_ddc(drm, &hdmi->connector,
+                                   &inno_hdmi_connector_funcs,
+                                   DRM_MODE_CONNECTOR_HDMIA,
+                                   hdmi->connector.ddc);
 
        drm_connector_attach_encoder(&hdmi->connector, encoder);
 
@@ -849,10 +850,10 @@ static int inno_hdmi_bind(struct device *dev, struct 
device *master,
 
        inno_hdmi_reset(hdmi);
 
-       hdmi->ddc = inno_hdmi_i2c_adapter(hdmi);
-       if (IS_ERR(hdmi->ddc)) {
-               ret = PTR_ERR(hdmi->ddc);
-               hdmi->ddc = NULL;
+       hdmi->connector.ddc = inno_hdmi_i2c_adapter(hdmi);
+       if (IS_ERR(hdmi->connector.ddc)) {
+               ret = PTR_ERR(hdmi->connector.ddc);
+               hdmi->connector.ddc = NULL;
                goto err_disable_clk;
        }
 
@@ -885,7 +886,7 @@ static int inno_hdmi_bind(struct device *dev, struct device 
*master,
        hdmi->connector.funcs->destroy(&hdmi->connector);
        hdmi->encoder.funcs->destroy(&hdmi->encoder);
 err_put_adapter:
-       i2c_put_adapter(hdmi->ddc);
+       i2c_put_adapter(hdmi->connector.ddc);
 err_disable_clk:
        clk_disable_unprepare(hdmi->pclk);
        return ret;
@@ -899,7 +900,7 @@ static void inno_hdmi_unbind(struct device *dev, struct 
device *master,
        hdmi->connector.funcs->destroy(&hdmi->connector);
        hdmi->encoder.funcs->destroy(&hdmi->encoder);
 
-       i2c_put_adapter(hdmi->ddc);
+       i2c_put_adapter(hdmi->connector.ddc);
        clk_disable_unprepare(hdmi->pclk);
 }
 
-- 
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx