drm/exynos: remove redundant mutex_unlock
[cascardo/linux.git] / drivers / gpu / drm / exynos / exynos_drm_drv.c
index 2d27ba2..c5a401a 100644 (file)
@@ -16,6 +16,7 @@
 #include <drm/drm_crtc_helper.h>
 
 #include <linux/anon_inodes.h>
+#include <linux/component.h>
 
 #include <drm/exynos_drm.h>
 
 
 #define VBLANK_OFF_DELAY       50000
 
-/* platform device pointer for eynos drm device. */
 static struct platform_device *exynos_drm_pdev;
 
+static DEFINE_MUTEX(drm_component_lock);
+static LIST_HEAD(drm_component_list);
+
+struct component_dev {
+       struct list_head list;
+       struct device *dev;
+};
+
 static int exynos_drm_load(struct drm_device *dev, unsigned long flags)
 {
        struct exynos_drm_private *private;
@@ -73,38 +81,21 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags)
 
        exynos_drm_mode_config_init(dev);
 
-       ret = exynos_drm_initialize_managers(dev);
-       if (ret)
-               goto err_mode_config_cleanup;
-
        for (nr = 0; nr < MAX_PLANE; nr++) {
                struct drm_plane *plane;
                unsigned long possible_crtcs = (1 << MAX_CRTC) - 1;
 
                plane = exynos_plane_init(dev, possible_crtcs, false);
                if (!plane)
-                       goto err_manager_cleanup;
+                       goto err_mode_config_cleanup;
        }
 
-       ret = exynos_drm_initialize_displays(dev);
-       if (ret)
-               goto err_manager_cleanup;
-
        /* init kms poll for handling hpd */
        drm_kms_helper_poll_init(dev);
 
        ret = drm_vblank_init(dev, MAX_CRTC);
        if (ret)
-               goto err_display_cleanup;
-
-       /*
-        * probe sub drivers such as display controller and hdmi driver,
-        * that were registered at probe() of platform driver
-        * to the sub driver and create encoder and connector for them.
-        */
-       ret = exynos_drm_device_register(dev);
-       if (ret)
-               goto err_vblank;
+               goto err_mode_config_cleanup;
 
        /* setup possible_clones. */
        exynos_drm_encoder_setup(dev);
@@ -113,17 +104,25 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags)
 
        platform_set_drvdata(dev->platformdev, dev);
 
+       /* Try to bind all sub drivers. */
+       ret = component_bind_all(dev->dev, dev);
+       if (ret)
+               goto err_cleanup_vblank;
+
+       /* Probe non kms sub drivers and virtual display driver. */
+       ret = exynos_drm_device_subdrv_probe(dev);
+       if (ret)
+               goto err_unbind_all;
+
        /* force connectors detection */
        drm_helper_hpd_irq_event(dev);
 
        return 0;
 
-err_vblank:
+err_unbind_all:
+       component_unbind_all(dev->dev, dev);
+err_cleanup_vblank:
        drm_vblank_cleanup(dev);
-err_display_cleanup:
-       exynos_drm_remove_displays(dev);
-err_manager_cleanup:
-       exynos_drm_remove_managers(dev);
 err_mode_config_cleanup:
        drm_mode_config_cleanup(dev);
        drm_release_iommu_mapping(dev);
@@ -135,17 +134,17 @@ err_free_private:
 
 static int exynos_drm_unload(struct drm_device *dev)
 {
+       exynos_drm_device_subdrv_remove(dev);
+
        exynos_drm_fbdev_fini(dev);
-       exynos_drm_device_unregister(dev);
        drm_vblank_cleanup(dev);
        drm_kms_helper_poll_fini(dev);
-       exynos_drm_remove_displays(dev);
-       exynos_drm_remove_managers(dev);
        drm_mode_config_cleanup(dev);
 
        drm_release_iommu_mapping(dev);
        kfree(dev->dev_private);
 
+       component_unbind_all(dev->dev, dev);
        dev->dev_private = NULL;
 
        return 0;
@@ -183,9 +182,9 @@ static int exynos_drm_resume(struct drm_device *dev)
                if (connector->funcs->dpms)
                        connector->funcs->dpms(connector, connector->dpms);
        }
+       drm_modeset_unlock_all(dev);
 
        drm_helper_resume_force_mode(dev);
-       drm_modeset_unlock_all(dev);
 
        return 0;
 }
@@ -323,8 +322,7 @@ static const struct file_operations exynos_drm_driver_fops = {
 };
 
 static struct drm_driver exynos_drm_driver = {
-       .driver_features        = DRIVER_HAVE_IRQ | DRIVER_MODESET |
-                                       DRIVER_GEM | DRIVER_PRIME,
+       .driver_features        = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME,
        .load                   = exynos_drm_load,
        .unload                 = exynos_drm_unload,
        .suspend                = exynos_drm_suspend,
@@ -355,27 +353,6 @@ static struct drm_driver exynos_drm_driver = {
        .minor  = DRIVER_MINOR,
 };
 
-static int exynos_drm_platform_probe(struct platform_device *pdev)
-{
-       int ret;
-
-       ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
-       if (ret)
-               return ret;
-
-       pm_runtime_enable(&pdev->dev);
-       pm_runtime_get_sync(&pdev->dev);
-
-       return drm_platform_init(&exynos_drm_driver, pdev);
-}
-
-static int exynos_drm_platform_remove(struct platform_device *pdev)
-{
-       drm_put_dev(platform_get_drvdata(pdev));
-
-       return 0;
-}
-
 #ifdef CONFIG_PM_SLEEP
 static int exynos_drm_sys_suspend(struct device *dev)
 {
@@ -400,196 +377,228 @@ static int exynos_drm_sys_resume(struct device *dev)
 }
 #endif
 
-#ifdef CONFIG_PM_RUNTIME
-static int exynos_drm_runtime_suspend(struct device *dev)
+static const struct dev_pm_ops exynos_drm_pm_ops = {
+       SET_SYSTEM_SLEEP_PM_OPS(exynos_drm_sys_suspend, exynos_drm_sys_resume)
+};
+
+int exynos_drm_component_add(struct device *dev,
+                               const struct component_ops *ops)
 {
-       struct drm_device *drm_dev = dev_get_drvdata(dev);
-       pm_message_t message;
+       struct component_dev *cdev;
+       int ret;
 
-       if (pm_runtime_suspended(dev))
-               return 0;
+       cdev = kzalloc(sizeof(*cdev), GFP_KERNEL);
+       if (!cdev)
+               return -ENOMEM;
 
-       message.event = PM_EVENT_SUSPEND;
-       return exynos_drm_suspend(drm_dev, message);
+       ret = component_add(dev, ops);
+       if (ret) {
+               kfree(cdev);
+               return ret;
+       }
+
+       cdev->dev = dev;
+
+       mutex_lock(&drm_component_lock);
+       list_add_tail(&cdev->list, &drm_component_list);
+       mutex_unlock(&drm_component_lock);
+
+       return 0;
 }
 
-static int exynos_drm_runtime_resume(struct device *dev)
+void exynos_drm_component_del(struct device *dev,
+                               const struct component_ops *ops)
 {
-       struct drm_device *drm_dev = dev_get_drvdata(dev);
+       struct component_dev *cdev, *next;
 
-       if (!pm_runtime_suspended(dev))
-               return 0;
+       mutex_lock(&drm_component_lock);
 
-       return exynos_drm_resume(drm_dev);
+       list_for_each_entry_safe(cdev, next, &drm_component_list, list) {
+               if (dev == cdev->dev) {
+                       list_del(&cdev->list);
+                       kfree(cdev);
+                       break;
+               }
+       }
+
+       mutex_unlock(&drm_component_lock);
+
+       component_del(dev, ops);
 }
-#endif
 
-static const struct dev_pm_ops exynos_drm_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(exynos_drm_sys_suspend, exynos_drm_sys_resume)
-       SET_RUNTIME_PM_OPS(exynos_drm_runtime_suspend,
-                       exynos_drm_runtime_resume, NULL)
-};
+static int compare_of(struct device *dev, void *data)
+{
+       return dev == (struct device *)data;
+}
 
-static struct platform_driver exynos_drm_platform_driver = {
-       .probe          = exynos_drm_platform_probe,
-       .remove         = exynos_drm_platform_remove,
-       .driver         = {
-               .owner  = THIS_MODULE,
-               .name   = "exynos-drm",
-               .pm     = &exynos_drm_pm_ops,
-       },
+static int exynos_drm_add_components(struct device *dev, struct master *m)
+{
+       unsigned int attached_cnt = 0;
+       struct component_dev *cdev;
+
+       mutex_lock(&drm_component_lock);
+
+       list_for_each_entry(cdev, &drm_component_list, list) {
+               int ret;
+
+               mutex_unlock(&drm_component_lock);
+
+               ret = component_master_add_child(m, compare_of, cdev->dev);
+               if (!ret)
+                       attached_cnt++;
+
+               mutex_lock(&drm_component_lock);
+       }
+
+       mutex_unlock(&drm_component_lock);
+
+       if (!attached_cnt)
+               return -ENXIO;
+
+       return 0;
+}
+
+static int exynos_drm_bind(struct device *dev)
+{
+       return drm_platform_init(&exynos_drm_driver, to_platform_device(dev));
+}
+
+static void exynos_drm_unbind(struct device *dev)
+{
+       drm_put_dev(dev_get_drvdata(dev));
+}
+
+static const struct component_master_ops exynos_drm_ops = {
+       .add_components = exynos_drm_add_components,
+       .bind           = exynos_drm_bind,
+       .unbind         = exynos_drm_unbind,
 };
 
-static int __init exynos_drm_init(void)
+static int exynos_drm_platform_probe(struct platform_device *pdev)
 {
        int ret;
 
+       pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+       exynos_drm_driver.num_ioctls = DRM_ARRAY_SIZE(exynos_ioctls);
+
+#ifdef CONFIG_DRM_EXYNOS_FIMD
+       ret = platform_driver_register(&fimd_driver);
+       if (ret < 0)
+               return ret;
+#endif
+
 #ifdef CONFIG_DRM_EXYNOS_DP
        ret = platform_driver_register(&dp_driver);
        if (ret < 0)
-               goto out_dp;
+               goto err_unregister_fimd_drv;
 #endif
 
 #ifdef CONFIG_DRM_EXYNOS_DSI
        ret = platform_driver_register(&dsi_driver);
        if (ret < 0)
-               goto out_dsi;
-#endif
-
-#ifdef CONFIG_DRM_EXYNOS_FIMD
-       ret = platform_driver_register(&fimd_driver);
-       if (ret < 0)
-               goto out_fimd;
+               goto err_unregister_dp_drv;
 #endif
 
 #ifdef CONFIG_DRM_EXYNOS_HDMI
-       ret = platform_driver_register(&hdmi_driver);
-       if (ret < 0)
-               goto out_hdmi;
        ret = platform_driver_register(&mixer_driver);
        if (ret < 0)
-               goto out_mixer;
-#endif
-
-#ifdef CONFIG_DRM_EXYNOS_VIDI
-       ret = platform_driver_register(&vidi_driver);
+               goto err_unregister_dsi_drv;
+       ret = platform_driver_register(&hdmi_driver);
        if (ret < 0)
-               goto out_vidi;
+               goto err_unregister_mixer_drv;
 #endif
 
 #ifdef CONFIG_DRM_EXYNOS_G2D
        ret = platform_driver_register(&g2d_driver);
        if (ret < 0)
-               goto out_g2d;
+               goto err_unregister_hdmi_drv;
 #endif
 
 #ifdef CONFIG_DRM_EXYNOS_FIMC
        ret = platform_driver_register(&fimc_driver);
        if (ret < 0)
-               goto out_fimc;
+               goto err_unregister_g2d_drv;
 #endif
 
 #ifdef CONFIG_DRM_EXYNOS_ROTATOR
        ret = platform_driver_register(&rotator_driver);
        if (ret < 0)
-               goto out_rotator;
+               goto err_unregister_fimc_drv;
 #endif
 
 #ifdef CONFIG_DRM_EXYNOS_GSC
        ret = platform_driver_register(&gsc_driver);
        if (ret < 0)
-               goto out_gsc;
+               goto err_unregister_rotator_drv;
 #endif
 
 #ifdef CONFIG_DRM_EXYNOS_IPP
        ret = platform_driver_register(&ipp_driver);
        if (ret < 0)
-               goto out_ipp;
+               goto err_unregister_gsc_drv;
 
        ret = exynos_platform_device_ipp_register();
        if (ret < 0)
-               goto out_ipp_dev;
+               goto err_unregister_ipp_drv;
 #endif
 
-       ret = platform_driver_register(&exynos_drm_platform_driver);
+       ret = component_master_add(&pdev->dev, &exynos_drm_ops);
        if (ret < 0)
-               goto out_drm;
-
-       exynos_drm_pdev = platform_device_register_simple("exynos-drm", -1,
-                               NULL, 0);
-       if (IS_ERR(exynos_drm_pdev)) {
-               ret = PTR_ERR(exynos_drm_pdev);
-               goto out;
-       }
+               DRM_DEBUG_KMS("re-tried by last sub driver probed later.\n");
 
        return 0;
 
-out:
-       platform_driver_unregister(&exynos_drm_platform_driver);
-
-out_drm:
 #ifdef CONFIG_DRM_EXYNOS_IPP
-       exynos_platform_device_ipp_unregister();
-out_ipp_dev:
+err_unregister_ipp_drv:
        platform_driver_unregister(&ipp_driver);
-out_ipp:
+err_unregister_gsc_drv:
 #endif
 
 #ifdef CONFIG_DRM_EXYNOS_GSC
        platform_driver_unregister(&gsc_driver);
-out_gsc:
+err_unregister_rotator_drv:
 #endif
 
 #ifdef CONFIG_DRM_EXYNOS_ROTATOR
        platform_driver_unregister(&rotator_driver);
-out_rotator:
+err_unregister_fimc_drv:
 #endif
 
 #ifdef CONFIG_DRM_EXYNOS_FIMC
        platform_driver_unregister(&fimc_driver);
-out_fimc:
+err_unregister_g2d_drv:
 #endif
 
 #ifdef CONFIG_DRM_EXYNOS_G2D
        platform_driver_unregister(&g2d_driver);
-out_g2d:
-#endif
-
-#ifdef CONFIG_DRM_EXYNOS_VIDI
-       platform_driver_unregister(&vidi_driver);
-out_vidi:
+err_unregister_hdmi_drv:
 #endif
 
 #ifdef CONFIG_DRM_EXYNOS_HDMI
-       platform_driver_unregister(&mixer_driver);
-out_mixer:
        platform_driver_unregister(&hdmi_driver);
-out_hdmi:
-#endif
-
-#ifdef CONFIG_DRM_EXYNOS_FIMD
-       platform_driver_unregister(&fimd_driver);
-out_fimd:
+err_unregister_mixer_drv:
+       platform_driver_unregister(&mixer_driver);
+err_unregister_dsi_drv:
 #endif
 
 #ifdef CONFIG_DRM_EXYNOS_DSI
        platform_driver_unregister(&dsi_driver);
-out_dsi:
+err_unregister_dp_drv:
 #endif
 
 #ifdef CONFIG_DRM_EXYNOS_DP
        platform_driver_unregister(&dp_driver);
-out_dp:
+err_unregister_fimd_drv:
+#endif
+
+#ifdef CONFIG_DRM_EXYNOS_FIMD
+       platform_driver_unregister(&fimd_driver);
 #endif
        return ret;
 }
 
-static void __exit exynos_drm_exit(void)
+static int exynos_drm_platform_remove(struct platform_device *pdev)
 {
-       platform_device_unregister(exynos_drm_pdev);
-
-       platform_driver_unregister(&exynos_drm_platform_driver);
-
 #ifdef CONFIG_DRM_EXYNOS_IPP
        exynos_platform_device_ipp_unregister();
        platform_driver_unregister(&ipp_driver);
@@ -616,10 +625,6 @@ static void __exit exynos_drm_exit(void)
        platform_driver_unregister(&hdmi_driver);
 #endif
 
-#ifdef CONFIG_DRM_EXYNOS_VIDI
-       platform_driver_unregister(&vidi_driver);
-#endif
-
 #ifdef CONFIG_DRM_EXYNOS_FIMD
        platform_driver_unregister(&fimd_driver);
 #endif
@@ -631,6 +636,59 @@ static void __exit exynos_drm_exit(void)
 #ifdef CONFIG_DRM_EXYNOS_DP
        platform_driver_unregister(&dp_driver);
 #endif
+       component_master_del(&pdev->dev, &exynos_drm_ops);
+       return 0;
+}
+
+static struct platform_driver exynos_drm_platform_driver = {
+       .probe  = exynos_drm_platform_probe,
+       .remove = exynos_drm_platform_remove,
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "exynos-drm",
+               .pm     = &exynos_drm_pm_ops,
+       },
+};
+
+static int exynos_drm_init(void)
+{
+       int ret;
+
+       exynos_drm_pdev = platform_device_register_simple("exynos-drm", -1,
+                                                               NULL, 0);
+       if (IS_ERR(exynos_drm_pdev))
+               return PTR_ERR(exynos_drm_pdev);
+
+#ifdef CONFIG_DRM_EXYNOS_VIDI
+       ret = exynos_drm_probe_vidi();
+       if (ret < 0)
+               goto err_unregister_pd;
+#endif
+
+       ret = platform_driver_register(&exynos_drm_platform_driver);
+       if (ret)
+               goto err_remove_vidi;
+
+       return 0;
+
+err_unregister_pd:
+       platform_device_unregister(exynos_drm_pdev);
+
+err_remove_vidi:
+#ifdef CONFIG_DRM_EXYNOS_VIDI
+       exynos_drm_remove_vidi();
+#endif
+
+       return ret;
+}
+
+static void exynos_drm_exit(void)
+{
+#ifdef CONFIG_DRM_EXYNOS_VIDI
+       exynos_drm_remove_vidi();
+#endif
+       platform_device_unregister(exynos_drm_pdev);
+       platform_driver_unregister(&exynos_drm_platform_driver);
 }
 
 module_init(exynos_drm_init);