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

Pull drm updates from Dave Airlie:
 "This is the main pull request for the drm for 4.3.  Nouveau is
  probably the biggest amount of changes in here, since it missed 4.2.
  Highlights below, along with the usual bunch of fixes.

  All stuff outside drm should have applicable acks.

  Highlights:

   - new drivers:
        freescale dcu kms driver

   - core:
        more atomic fixes
        disable some dri1 interfaces on kms drivers
        drop fb panic handling, this was just getting more broken, as more locking was required.
        new core fbdev Kconfig support - instead of each driver enable/disabling it
        struct_mutex cleanups

   - panel:
        more new panels
        cleanup Kconfig

   - i915:
        Skylake support enabled by default
        legacy modesetting using atomic infrastructure
        Skylake fixes
        GEN9 workarounds

   - amdgpu:
        Fiji support
        CGS support for amdgpu
        Initial GPU scheduler - off by default
        Lots of bug fixes and optimisations.

   - radeon:
        DP fixes
        misc fixes

   - amdkfd:
        Add Carrizo support for amdkfd using amdgpu.

   - nouveau:
        long pending cleanup to complete driver,
        fully bisectable which makes it larger,
        perfmon work
        more reclocking improvements
        maxwell displayport fixes

   - vmwgfx:
        new DX device support, supports OpenGL 3.3
        screen targets support

   - mgag200:
        G200eW support
        G200e new revision support

   - msm:
        dragonboard 410c support, msm8x94 support, msm8x74v1 support
        yuv format support
        dma plane support
        mdp5 rotation
        initial hdcp

   - sti:
        atomic support

   - exynos:
        lots of cleanups
        atomic modesetting/pageflipping support
        render node support

   - tegra:
        tegra210 support (dc, dsi, dp/hdmi)
        dpms with atomic modesetting support

   - atmel:
        support for 3 more atmel SoCs
        new input formats, PRIME support.

   - dwhdmi:
        preparing to add audio support

   - rockchip:
        yuv plane support"

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (1369 commits)
  drm/amdgpu: rename gmc_v8_0_init_compute_vmid
  drm/amdgpu: fix vce3 instance handling
  drm/amdgpu: remove ib test for the second VCE Ring
  drm/amdgpu: properly enable VM fault interrupts
  drm/amdgpu: fix warning in scheduler
  drm/amdgpu: fix buffer placement under memory pressure
  drm/amdgpu/cz: fix cz_dpm_update_low_memory_pstate logic
  drm/amdgpu: fix typo in dce11 watermark setup
  drm/amdgpu: fix typo in dce10 watermark setup
  drm/amdgpu: use top down allocation for non-CPU accessible vram
  drm/amdgpu: be explicit about cpu vram access for driver BOs (v2)
  drm/amdgpu: set MEC doorbell range for Fiji
  drm/amdgpu: implement burst NOP for SDMA
  drm/amdgpu: add insert_nop ring func and default implementation
  drm/amdgpu: add amdgpu_get_sdma_instance helper function
  drm/amdgpu: add AMDGPU_MAX_SDMA_INSTANCES
  drm/amdgpu: add burst_nop flag for sdma
  drm/amdgpu: add count field for the SDMA NOP packet v2
  drm/amdgpu: use PT for VM sync on unmap
  drm/amdgpu: make wait_event uninterruptible in push_job
  ...

3 files changed, 46 insertions, 36 deletions

diff --git a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.c b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.c
index 509376fdd112..5104fc9f9a53 100644
--- a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.c
+++ b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.c
@@ -72,31 +72,14 @@ long msm_dsi_pll_helper_clk_round_rate(struct clk_hw *hw,
 int msm_dsi_pll_helper_clk_prepare(struct clk_hw *hw)
 {
         struct msm_dsi_pll *pll = hw_clk_to_pll(hw);
-        int ret;
-
-        /*
-         * Certain PLLs need to update the same VCO rate and registers
-         * after resume in suspend/resume scenario.
-         */
-        if (pll->restore_state) {
-                ret = pll->restore_state(pll);
-                if (ret)
-                        goto error;
-        }
 
-        ret = dsi_pll_enable(pll);
-
-error:
-        return ret;
+        return dsi_pll_enable(pll);
 }
 
 void msm_dsi_pll_helper_clk_unprepare(struct clk_hw *hw)
 {
         struct msm_dsi_pll *pll = hw_clk_to_pll(hw);
 
-        if (pll->save_state)
-                pll->save_state(pll);
-
         dsi_pll_disable(pll);
 }
 
@@ -134,6 +117,29 @@ void msm_dsi_pll_destroy(struct msm_dsi_pll *pll)
                 pll->destroy(pll);
 }
 
+void msm_dsi_pll_save_state(struct msm_dsi_pll *pll)
+{
+        if (pll->save_state) {
+                pll->save_state(pll);
+                pll->state_saved = true;
+        }
+}
+
+int msm_dsi_pll_restore_state(struct msm_dsi_pll *pll)
+{
+        int ret;
+
+        if (pll->restore_state && pll->state_saved) {
+                ret = pll->restore_state(pll);
+                if (ret)
+                        return ret;
+
+                pll->state_saved = false;
+        }
+
+        return 0;
+}
+
 struct msm_dsi_pll *msm_dsi_pll_init(struct platform_device *pdev,
                         enum msm_dsi_phy_type type, int id)
 {
diff --git a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h
index 5a3bb241c039..063caa2c5740 100644
--- a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h
+++ b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h
@@ -27,6 +27,7 @@ struct msm_dsi_pll {
 
         struct clk_hw   clk_hw;
         bool            pll_on;
+        bool            state_saved;
 
         unsigned long   min_rate;
         unsigned long   max_rate;
@@ -82,8 +83,16 @@ void msm_dsi_pll_helper_unregister_clks(struct platform_device *pdev,
 /*
  * Initialization for Each PLL Type
  */
+#ifdef CONFIG_DRM_MSM_DSI_28NM_PHY
 struct msm_dsi_pll *msm_dsi_pll_28nm_init(struct platform_device *pdev,
                                         enum msm_dsi_phy_type type, int id);
+#else
+static inline struct msm_dsi_pll *msm_dsi_pll_28nm_init(
+        struct platform_device *pdev, enum msm_dsi_phy_type type, int id)
+{
+        return ERR_PTR(-ENODEV);
+}
+#endif
 
 #endif /* __DSI_PLL_H__ */
 
diff --git a/drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c b/drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c
index 18b7727bdc57..598fdaff0a41 100644
--- a/drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c
+++ b/drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c
@@ -465,26 +465,21 @@ static int dsi_pll_28nm_restore_state(struct msm_dsi_pll *pll)
         void __iomem *base = pll_28nm->mmio;
         int ret;
 
-        if ((cached_state->vco_rate != 0) &&
-                (cached_state->vco_rate == clk_hw_get_rate(&pll->clk_hw))) {
-                ret = dsi_pll_28nm_clk_set_rate(&pll->clk_hw,
-                                                cached_state->vco_rate, 0);
-                if (ret) {
-                        dev_err(&pll_28nm->pdev->dev,
-                                "restore vco rate failed. ret=%d\n", ret);
-                        return ret;
-                }
-
-                pll_write(base + REG_DSI_28nm_PHY_PLL_POSTDIV3_CFG,
-                                cached_state->postdiv3);
-                pll_write(base + REG_DSI_28nm_PHY_PLL_POSTDIV1_CFG,
-                                cached_state->postdiv1);
-                pll_write(base + REG_DSI_28nm_PHY_PLL_VREG_CFG,
-                                cached_state->byte_mux);
-
-                cached_state->vco_rate = 0;
+        ret = dsi_pll_28nm_clk_set_rate(&pll->clk_hw,
+                                        cached_state->vco_rate, 0);
+        if (ret) {
+                dev_err(&pll_28nm->pdev->dev,
+                        "restore vco rate failed. ret=%d\n", ret);
+                return ret;
         }
 
+        pll_write(base + REG_DSI_28nm_PHY_PLL_POSTDIV3_CFG,
+                        cached_state->postdiv3);
+        pll_write(base + REG_DSI_28nm_PHY_PLL_POSTDIV1_CFG,
+                        cached_state->postdiv1);
+        pll_write(base + REG_DSI_28nm_PHY_PLL_VREG_CFG,
+                        cached_state->byte_mux);
+
         return 0;
 }