Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

Pull drm updates from Dave Airlie:
 "Highlights:

   - AMD KFD driver merge

     This is the AMD HSA interface for exposing a lowlevel interface for
     GPGPU use.  They have an open source userspace built on top of this
     interface, and the code looks as good as it was going to get out of
     tree.

   - Initial atomic modesetting work

     The need for an atomic modesetting interface to allow userspace to
     try and send a complete set of modesetting state to the driver has
     arisen, and been suffering from neglect this past year.  No more,
     the start of the common code and changes for msm driver to use it
     are in this tree.  Ongoing work to get the userspace ioctl finished
     and the code clean will probably wait until next kernel.

   - DisplayID 1.3 and tiled monitor exposed to userspace.

     Tiled monitor property is now exposed for userspace to make use of.

   - Rockchip drm driver merged.

   - imx gpu driver moved out of staging

  Other stuff:

   - core:
        panel - MIPI DSI + new panels.
        expose suggested x/y properties for virtual GPUs

   - i915:
        Initial Skylake (SKL) support
        gen3/4 reset work
        start of dri1/ums removal
        infoframe tracking
        fixes for lots of things.

   - nouveau:
        tegra k1 voltage support
        GM204 modesetting support
        GT21x memory reclocking work

   - radeon:
        CI dpm fixes
        GPUVM improvements
        Initial DPM fan control

   - rcar-du:
        HDMI support added
        removed some support for old boards
        slave encoder driver for Analog Devices adv7511

   - exynos:
        Exynos4415 SoC support

   - msm:
        a4xx gpu support
        atomic helper conversion

   - tegra:
        iommu support
        universal plane support
        ganged-mode DSI support

   - sti:
        HDMI i2c improvements

   - vmwgfx:
        some late fixes.

   - qxl:
        use suggested x/y properties"

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (969 commits)
  drm: sti: fix module compilation issue
  drm/i915: save/restore GMBUS freq across suspend/resume on gen4
  drm: sti: correctly cleanup CRTC and planes
  drm: sti: add HQVDP plane
  drm: sti: add cursor plane
  drm: sti: enable auxiliary CRTC
  drm: sti: fix delay in VTG programming
  drm: sti: prepare sti_tvout to support auxiliary crtc
  drm: sti: use drm_crtc_vblank_{on/off} instead of drm_vblank_{on/off}
  drm: sti: fix hdmi avi infoframe
  drm: sti: remove event lock while disabling vblank
  drm: sti: simplify gdp code
  drm: sti: clear all mixer control
  drm: sti: remove gpio for HDMI hot plug detection
  drm: sti: allow to change hdmi ddc i2c adapter
  drm/doc: Document drm_add_modes_noedid() usage
  drm/i915: Remove '& 0xffff' from the mask given to WA_REG()
  drm/i915: Invert the mask and val arguments in wa_add() and WA_REG()
  drm: Zero out DRM object memory upon cleanup
  drm/i915/bdw: Fix the write setting up the WIZ hashing mode
  ...

1 files changed, 95 insertions, 157 deletions

diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
index e277d4f12812..121470a83d1a 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
@@ -203,8 +203,6 @@ static int exynos_drm_resume(struct drm_device *dev)
         }
         drm_modeset_unlock_all(dev);
 
-        drm_helper_resume_force_mode(dev);
-
         return 0;
 }
 
@@ -475,8 +473,6 @@ void exynos_drm_component_del(struct device *dev,
                         list_del(&cdev->list);
                         kfree(cdev);
                 }
-
-                break;
         }
 
         mutex_unlock(&drm_component_lock);
@@ -556,182 +552,68 @@ static const struct component_master_ops exynos_drm_ops = {
         .unbind         = exynos_drm_unbind,
 };
 
-static int exynos_drm_platform_probe(struct platform_device *pdev)
-{
-        struct component_match *match;
-        int ret;
-
-        pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
-        exynos_drm_driver.num_ioctls = ARRAY_SIZE(exynos_ioctls);
-
+static struct platform_driver *const exynos_drm_kms_drivers[] = {
 #ifdef CONFIG_DRM_EXYNOS_FIMD
-        ret = platform_driver_register(&fimd_driver);
-        if (ret < 0)
-                return ret;
+        &fimd_driver,
 #endif
-
 #ifdef CONFIG_DRM_EXYNOS_DP
-        ret = platform_driver_register(&dp_driver);
-        if (ret < 0)
-                goto err_unregister_fimd_drv;
+        &dp_driver,
 #endif
-
 #ifdef CONFIG_DRM_EXYNOS_DSI
-        ret = platform_driver_register(&dsi_driver);
-        if (ret < 0)
-                goto err_unregister_dp_drv;
+        &dsi_driver,
 #endif
-
 #ifdef CONFIG_DRM_EXYNOS_HDMI
-        ret = platform_driver_register(&mixer_driver);
-        if (ret < 0)
-                goto err_unregister_dsi_drv;
-        ret = platform_driver_register(&hdmi_driver);
-        if (ret < 0)
-                goto err_unregister_mixer_drv;
+        &mixer_driver,
+        &hdmi_driver,
 #endif
+};
 
-        match = exynos_drm_match_add(&pdev->dev);
-        if (IS_ERR(match)) {
-                ret = PTR_ERR(match);
-                goto err_unregister_hdmi_drv;
-        }
-
-        ret = component_master_add_with_match(&pdev->dev, &exynos_drm_ops,
-                                                match);
-        if (ret < 0)
-                goto err_unregister_hdmi_drv;
-
+static struct platform_driver *const exynos_drm_non_kms_drivers[] = {
 #ifdef CONFIG_DRM_EXYNOS_G2D
-        ret = platform_driver_register(&g2d_driver);
-        if (ret < 0)
-                goto err_del_component_master;
+        &g2d_driver,
 #endif
-
 #ifdef CONFIG_DRM_EXYNOS_FIMC
-        ret = platform_driver_register(&fimc_driver);
-        if (ret < 0)
-                goto err_unregister_g2d_drv;
+        &fimc_driver,
 #endif
-
 #ifdef CONFIG_DRM_EXYNOS_ROTATOR
-        ret = platform_driver_register(&rotator_driver);
-        if (ret < 0)
-                goto err_unregister_fimc_drv;
+        &rotator_driver,
 #endif
-
 #ifdef CONFIG_DRM_EXYNOS_GSC
-        ret = platform_driver_register(&gsc_driver);
-        if (ret < 0)
-                goto err_unregister_rotator_drv;
-#endif
-
-#ifdef CONFIG_DRM_EXYNOS_IPP
-        ret = platform_driver_register(&ipp_driver);
-        if (ret < 0)
-                goto err_unregister_gsc_drv;
-
-        ret = exynos_platform_device_ipp_register();
-        if (ret < 0)
-                goto err_unregister_ipp_drv;
+        &gsc_driver,
 #endif
-
-        return ret;
-
 #ifdef CONFIG_DRM_EXYNOS_IPP
-err_unregister_ipp_drv:
-        platform_driver_unregister(&ipp_driver);
-err_unregister_gsc_drv:
-#endif
-
-#ifdef CONFIG_DRM_EXYNOS_GSC
-        platform_driver_unregister(&gsc_driver);
-err_unregister_rotator_drv:
+        &ipp_driver,
 #endif
+};
 
-#ifdef CONFIG_DRM_EXYNOS_ROTATOR
-        platform_driver_unregister(&rotator_driver);
-err_unregister_fimc_drv:
-#endif
-
-#ifdef CONFIG_DRM_EXYNOS_FIMC
-        platform_driver_unregister(&fimc_driver);
-err_unregister_g2d_drv:
-#endif
-
-#ifdef CONFIG_DRM_EXYNOS_G2D
-        platform_driver_unregister(&g2d_driver);
-err_del_component_master:
-#endif
-        component_master_del(&pdev->dev, &exynos_drm_ops);
-
-err_unregister_hdmi_drv:
-#ifdef CONFIG_DRM_EXYNOS_HDMI
-        platform_driver_unregister(&hdmi_driver);
-err_unregister_mixer_drv:
-        platform_driver_unregister(&mixer_driver);
-err_unregister_dsi_drv:
-#endif
+static int exynos_drm_platform_probe(struct platform_device *pdev)
+{
+        struct component_match *match;
 
-#ifdef CONFIG_DRM_EXYNOS_DSI
-        platform_driver_unregister(&dsi_driver);
-err_unregister_dp_drv:
-#endif
+        pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+        exynos_drm_driver.num_ioctls = ARRAY_SIZE(exynos_ioctls);
 
-#ifdef CONFIG_DRM_EXYNOS_DP
-        platform_driver_unregister(&dp_driver);
-err_unregister_fimd_drv:
-#endif
+        match = exynos_drm_match_add(&pdev->dev);
+        if (IS_ERR(match)) {
+                return PTR_ERR(match);
+        }
 
-#ifdef CONFIG_DRM_EXYNOS_FIMD
-        platform_driver_unregister(&fimd_driver);
-#endif
-        return ret;
+        return component_master_add_with_match(&pdev->dev, &exynos_drm_ops,
+                                               match);
 }
 
 static int exynos_drm_platform_remove(struct platform_device *pdev)
 {
-#ifdef CONFIG_DRM_EXYNOS_IPP
-        exynos_platform_device_ipp_unregister();
-        platform_driver_unregister(&ipp_driver);
-#endif
-
-#ifdef CONFIG_DRM_EXYNOS_GSC
-        platform_driver_unregister(&gsc_driver);
-#endif
-
-#ifdef CONFIG_DRM_EXYNOS_ROTATOR
-        platform_driver_unregister(&rotator_driver);
-#endif
-
-#ifdef CONFIG_DRM_EXYNOS_FIMC
-        platform_driver_unregister(&fimc_driver);
-#endif
-
-#ifdef CONFIG_DRM_EXYNOS_G2D
-        platform_driver_unregister(&g2d_driver);
-#endif
-
-#ifdef CONFIG_DRM_EXYNOS_HDMI
-        platform_driver_unregister(&mixer_driver);
-        platform_driver_unregister(&hdmi_driver);
-#endif
-
-#ifdef CONFIG_DRM_EXYNOS_FIMD
-        platform_driver_unregister(&fimd_driver);
-#endif
-
-#ifdef CONFIG_DRM_EXYNOS_DSI
-        platform_driver_unregister(&dsi_driver);
-#endif
-
-#ifdef CONFIG_DRM_EXYNOS_DP
-        platform_driver_unregister(&dp_driver);
-#endif
         component_master_del(&pdev->dev, &exynos_drm_ops);
         return 0;
 }
 
+static const char * const strings[] = {
+        "samsung,exynos3",
+        "samsung,exynos4",
+        "samsung,exynos5",
+};
+
 static struct platform_driver exynos_drm_platform_driver = {
         .probe  = exynos_drm_platform_probe,
         .remove = exynos_drm_platform_remove,
@@ -743,7 +625,25 @@ static struct platform_driver exynos_drm_platform_driver = {
 
 static int exynos_drm_init(void)
 {
-        int ret;
+        bool is_exynos = false;
+        int ret, i, j;
+
+        /*
+         * Register device object only in case of Exynos SoC.
+         *
+         * Below codes resolves temporarily infinite loop issue incurred
+         * by Exynos drm driver when using multi-platform kernel.
+         * So these codes will be replaced with more generic way later.
+         */
+        for (i = 0; i < ARRAY_SIZE(strings); i++) {
+                if (of_machine_is_compatible(strings[i])) {
+                        is_exynos = true;
+                        break;
+                }
+        }
+
+        if (!is_exynos)
+                return -ENODEV;
 
         /*
          * Register device object only in case of Exynos SoC.
@@ -762,24 +662,50 @@ static int exynos_drm_init(void)
         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;
+
+        for (i = 0; i < ARRAY_SIZE(exynos_drm_kms_drivers); ++i) {
+                ret = platform_driver_register(exynos_drm_kms_drivers[i]);
+                if (ret < 0)
+                        goto err_unregister_kms_drivers;
+        }
+
+        for (j = 0; j < ARRAY_SIZE(exynos_drm_non_kms_drivers); ++j) {
+                ret = platform_driver_register(exynos_drm_non_kms_drivers[j]);
+                if (ret < 0)
+                        goto err_unregister_non_kms_drivers;
+        }
+
+#ifdef CONFIG_DRM_EXYNOS_IPP
+        ret = exynos_platform_device_ipp_register();
+        if (ret < 0)
+                goto err_unregister_non_kms_drivers;
 #endif
 
         ret = platform_driver_register(&exynos_drm_platform_driver);
         if (ret)
-                goto err_remove_vidi;
+                goto err_unregister_resources;
 
         return 0;
 
-err_remove_vidi:
-#ifdef CONFIG_DRM_EXYNOS_VIDI
+err_unregister_resources:
+#ifdef CONFIG_DRM_EXYNOS_IPP
+        exynos_platform_device_ipp_unregister();
+#endif
+
+err_unregister_non_kms_drivers:
+        while (--j >= 0)
+                platform_driver_unregister(exynos_drm_non_kms_drivers[j]);
+
+err_unregister_kms_drivers:
+        while (--i >= 0)
+                platform_driver_unregister(exynos_drm_kms_drivers[i]);
+
         exynos_drm_remove_vidi();
 
 err_unregister_pd:
-#endif
         platform_device_unregister(exynos_drm_pdev);
 
         return ret;
@@ -787,10 +713,22 @@ err_unregister_pd:
 
 static void exynos_drm_exit(void)
 {
+        int i;
+
+#ifdef CONFIG_DRM_EXYNOS_IPP
+        exynos_platform_device_ipp_unregister();
+#endif
+
+        for (i = ARRAY_SIZE(exynos_drm_non_kms_drivers) - 1; i >= 0; --i)
+                platform_driver_unregister(exynos_drm_non_kms_drivers[i]);
+
+        for (i = ARRAY_SIZE(exynos_drm_kms_drivers) - 1; i >= 0; --i)
+                platform_driver_unregister(exynos_drm_kms_drivers[i]);
+
         platform_driver_unregister(&exynos_drm_platform_driver);
-#ifdef CONFIG_DRM_EXYNOS_VIDI
+
         exynos_drm_remove_vidi();
-#endif
+
         platform_device_unregister(exynos_drm_pdev);
 }