Use the ddc pointer provided by the generic connector.

Signed-off-by: Andrzej Pietrasiewicz <andrze...@collabora.com>
---
 drivers/gpu/drm/vc4/vc4_hdmi.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 87ad0879edf3..b46df3aa1798 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -75,7 +75,6 @@ struct vc4_hdmi {
 
        struct vc4_hdmi_audio audio;
 
-       struct i2c_adapter *ddc;
        void __iomem *hdmicore_regs;
        void __iomem *hd_regs;
        int hpd_gpio;
@@ -206,7 +205,7 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, 
bool force)
                return connector_status_disconnected;
        }
 
-       if (drm_probe_ddc(vc4->hdmi->ddc))
+       if (drm_probe_ddc(connector->ddc))
                return connector_status_connected;
 
        if (HDMI_READ(VC4_HDMI_HOTPLUG) & VC4_HDMI_HOTPLUG_CONNECTED)
@@ -232,7 +231,7 @@ static int vc4_hdmi_connector_get_modes(struct 
drm_connector *connector)
        int ret = 0;
        struct edid *edid;
 
-       edid = drm_get_edid(connector, vc4->hdmi->ddc);
+       edid = drm_get_edid(connector, connector->ddc);
        cec_s_phys_addr_from_edid(vc4->hdmi->cec_adap, edid);
        if (!edid)
                return -ENODEV;
@@ -1287,6 +1286,7 @@ static int vc4_hdmi_bind(struct device *dev, struct 
device *master, void *data)
        struct vc4_hdmi *hdmi;
        struct vc4_hdmi_encoder *vc4_hdmi_encoder;
        struct device_node *ddc_node;
+       struct i2c_adapter *ddc;
        u32 value;
        int ret;
 
@@ -1334,9 +1334,9 @@ static int vc4_hdmi_bind(struct device *dev, struct 
device *master, void *data)
                return -ENODEV;
        }
 
-       hdmi->ddc = of_find_i2c_adapter_by_node(ddc_node);
+       ddc = of_find_i2c_adapter_by_node(ddc_node);
        of_node_put(ddc_node);
-       if (!hdmi->ddc) {
+       if (ddc) {
                DRM_DEBUG("Failed to get ddc i2c adapter by node\n");
                return -EPROBE_DEFER;
        }
@@ -1396,6 +1396,7 @@ static int vc4_hdmi_bind(struct device *dev, struct 
device *master, void *data)
                ret = PTR_ERR(hdmi->connector);
                goto err_destroy_encoder;
        }
+       hdmi->connector->ddc = ddc;
 #ifdef CONFIG_DRM_VC4_HDMI_CEC
        hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops,
                                              vc4, "vc4",
@@ -1448,7 +1449,7 @@ static int vc4_hdmi_bind(struct device *dev, struct 
device *master, void *data)
        clk_disable_unprepare(hdmi->hsm_clock);
        pm_runtime_disable(dev);
 err_put_i2c:
-       put_device(&hdmi->ddc->dev);
+       put_device(&ddc->dev);
 
        return ret;
 }
@@ -1459,6 +1460,7 @@ static void vc4_hdmi_unbind(struct device *dev, struct 
device *master,
        struct drm_device *drm = dev_get_drvdata(master);
        struct vc4_dev *vc4 = drm->dev_private;
        struct vc4_hdmi *hdmi = vc4->hdmi;
+       struct i2c_adapter *ddc = hdmi->connector->ddc;
 
        cec_unregister_adapter(hdmi->cec_adap);
        vc4_hdmi_connector_destroy(hdmi->connector);
@@ -1467,7 +1469,7 @@ static void vc4_hdmi_unbind(struct device *dev, struct 
device *master,
        clk_disable_unprepare(hdmi->hsm_clock);
        pm_runtime_disable(dev);
 
-       put_device(&hdmi->ddc->dev);
+       put_device(&ddc->dev);
 
        vc4->hdmi = NULL;
 }
-- 
2.17.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to