Merge tag 'drm-misc-next-2020-04-14' of git://anongit.freedesktop.org/drm/drm-misc...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / rockchip / analogix_dp-rockchip.c

diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
index 8485227973144fced5a6a44e45f1c7fc72a44815..ade2327a10e2c3d340bf91846f25f4748c34c70e 100644 (file)
--- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
+++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
@@ -322,15 +322,9 @@ static int rockchip_dp_bind(struct device *dev, struct device *master,
                            void *data)
 {
        struct rockchip_dp_device *dp = dev_get_drvdata(dev);
-       const struct rockchip_dp_chip_data *dp_data;
        struct drm_device *drm_dev = data;
        int ret;
 
-       dp_data = of_device_get_match_data(dev);
-       if (!dp_data)
-               return -ENODEV;
-
-       dp->data = dp_data;
        dp->drm_dev = drm_dev;
 
        ret = rockchip_dp_drm_create_encoder(dp);
@@ -341,16 +335,9 @@ static int rockchip_dp_bind(struct device *dev, struct device *master,
 
        dp->plat_data.encoder = &dp->encoder;
 
-       dp->plat_data.dev_type = dp->data->chip_type;
-       dp->plat_data.power_on_start = rockchip_dp_poweron_start;
-       dp->plat_data.power_off = rockchip_dp_powerdown;
-       dp->plat_data.get_modes = rockchip_dp_get_modes;
-
-       dp->adp = analogix_dp_bind(dev, dp->drm_dev, &dp->plat_data);
-       if (IS_ERR(dp->adp)) {
-               ret = PTR_ERR(dp->adp);
+       ret = analogix_dp_bind(dp->adp, drm_dev);
+       if (ret)
                goto err_cleanup_encoder;
-       }
 
        return 0;
 err_cleanup_encoder:
@@ -365,8 +352,6 @@ static void rockchip_dp_unbind(struct device *dev, struct device *master,
 
        analogix_dp_unbind(dp->adp);
        dp->encoder.funcs->destroy(&dp->encoder);
-
-       dp->adp = ERR_PTR(-ENODEV);
 }
 
 static const struct component_ops rockchip_dp_component_ops = {
@@ -377,10 +362,15 @@ static const struct component_ops rockchip_dp_component_ops = {
 static int rockchip_dp_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
+       const struct rockchip_dp_chip_data *dp_data;
        struct drm_panel *panel = NULL;
        struct rockchip_dp_device *dp;
        int ret;
 
+       dp_data = of_device_get_match_data(dev);
+       if (!dp_data)
+               return -ENODEV;
+
        ret = drm_of_find_panel_or_bridge(dev->of_node, 1, 0, &panel, NULL);
        if (ret < 0)
                return ret;
@@ -391,7 +381,12 @@ static int rockchip_dp_probe(struct platform_device *pdev)
 
        dp->dev = dev;
        dp->adp = ERR_PTR(-ENODEV);
+       dp->data = dp_data;
        dp->plat_data.panel = panel;
+       dp->plat_data.dev_type = dp->data->chip_type;
+       dp->plat_data.power_on_start = rockchip_dp_poweron_start;
+       dp->plat_data.power_off = rockchip_dp_powerdown;
+       dp->plat_data.get_modes = rockchip_dp_get_modes;
 
        ret = rockchip_dp_of_probe(dp);
        if (ret < 0)
@@ -399,12 +394,19 @@ static int rockchip_dp_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, dp);
 
+       dp->adp = analogix_dp_probe(dev, &dp->plat_data);
+       if (IS_ERR(dp->adp))
+               return PTR_ERR(dp->adp);
+
        return component_add(dev, &rockchip_dp_component_ops);
 }
 
 static int rockchip_dp_remove(struct platform_device *pdev)
 {
+       struct rockchip_dp_device *dp = platform_get_drvdata(pdev);
+
        component_del(&pdev->dev, &rockchip_dp_component_ops);
+       analogix_dp_remove(dp->adp);
 
        return 0;
 }