1 files changed, 108 insertions, 4 deletions

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index e913efa4ea0a..7a7421fb02b4 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -56,6 +56,10 @@ static char *vram;
 MODULE_PARM_DESC(vram, "Configure VRAM size (for devices without IOMMU/GPUMMU");
 module_param(vram, charp, 0);
 
+/*
+ * Util/helpers:
+ */
+
 void __iomem *msm_ioremap(struct platform_device *pdev, const char *name,
                 const char *dbgname)
 {
@@ -143,6 +147,8 @@ static int msm_unload(struct drm_device *dev)
                                 priv->vram.paddr, &attrs);
         }
 
+        component_unbind_all(dev->dev, dev);
+
         dev->dev_private = NULL;
 
         kfree(priv);
@@ -175,6 +181,7 @@ static int msm_load(struct drm_device *dev, unsigned long flags)
         struct msm_kms *kms;
         int ret;
 
+
         priv = kzalloc(sizeof(*priv), GFP_KERNEL);
         if (!priv) {
                 dev_err(dev->dev, "failed to allocate private data\n");
@@ -226,6 +233,13 @@ static int msm_load(struct drm_device *dev, unsigned long flags)
                                 (uint32_t)(priv->vram.paddr + size));
         }
 
+        platform_set_drvdata(pdev, dev);
+
+        /* Bind all our sub-components: */
+        ret = component_bind_all(dev->dev, dev);
+        if (ret)
+                return ret;
+
         switch (get_mdp_ver(pdev)) {
         case 4:
                 kms = mdp4_kms_init(dev);
@@ -281,8 +295,6 @@ static int msm_load(struct drm_device *dev, unsigned long flags)
                 goto fail;
         }
 
-        platform_set_drvdata(pdev, dev);
-
 #ifdef CONFIG_DRM_MSM_FBDEV
         priv->fbdev = msm_fbdev_init(dev);
 #endif
@@ -824,18 +836,110 @@ static const struct dev_pm_ops msm_pm_ops = {
 };
 
 /*
+ * Componentized driver support:
+ */
+
+#ifdef CONFIG_OF
+/* NOTE: the CONFIG_OF case duplicates the same code as exynos or imx
+ * (or probably any other).. so probably some room for some helpers
+ */
+static int compare_of(struct device *dev, void *data)
+{
+        return dev->of_node == data;
+}
+
+static int msm_drm_add_components(struct device *master, struct master *m)
+{
+        struct device_node *np = master->of_node;
+        unsigned i;
+        int ret;
+
+        for (i = 0; ; i++) {
+                struct device_node *node;
+
+                node = of_parse_phandle(np, "connectors", i);
+                if (!node)
+                        break;
+
+                ret = component_master_add_child(m, compare_of, node);
+                of_node_put(node);
+
+                if (ret)
+                        return ret;
+        }
+        return 0;
+}
+#else
+static int compare_dev(struct device *dev, void *data)
+{
+        return dev == data;
+}
+
+static int msm_drm_add_components(struct device *master, struct master *m)
+{
+        /* For non-DT case, it kinda sucks.  We don't actually have a way
+         * to know whether or not we are waiting for certain devices (or if
+         * they are simply not present).  But for non-DT we only need to
+         * care about apq8064/apq8060/etc (all mdp4/a3xx):
+         */
+        static const char *devnames[] = {
+                        "hdmi_msm.0", "kgsl-3d0.0",
+        };
+        int i;
+
+        DBG("Adding components..");
+
+        for (i = 0; i < ARRAY_SIZE(devnames); i++) {
+                struct device *dev;
+                int ret;
+
+                dev = bus_find_device_by_name(&platform_bus_type,
+                                NULL, devnames[i]);
+                if (!dev) {
+                        dev_info(master, "still waiting for %s\n", devnames[i]);
+                        return -EPROBE_DEFER;
+                }
+
+                ret = component_master_add_child(m, compare_dev, dev);
+                if (ret) {
+                        DBG("could not add child: %d", ret);
+                        return ret;
+                }
+        }
+
+        return 0;
+}
+#endif
+
+static int msm_drm_bind(struct device *dev)
+{
+        return drm_platform_init(&msm_driver, to_platform_device(dev));
+}
+
+static void msm_drm_unbind(struct device *dev)
+{
+        drm_put_dev(platform_get_drvdata(to_platform_device(dev)));
+}
+
+static const struct component_master_ops msm_drm_ops = {
+                .add_components = msm_drm_add_components,
+                .bind = msm_drm_bind,
+                .unbind = msm_drm_unbind,
+};
+
+/*
  * Platform driver:
  */
 
 static int msm_pdev_probe(struct platform_device *pdev)
 {
         pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
-        return drm_platform_init(&msm_driver, pdev);
+        return component_master_add(&pdev->dev, &msm_drm_ops);
 }
 
 static int msm_pdev_remove(struct platform_device *pdev)
 {
-        drm_put_dev(platform_get_drvdata(pdev));
+        component_master_del(&pdev->dev, &msm_drm_ops);
 
         return 0;
 }