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

Pull drm updates from Dave Airlie:
 "I Was Almost Tempted To Capitalise Every Word, but then I decided I
  couldn't read it myself!

  I've also got one pull request for the sti driver outstanding.  It
  relied on a commit in Greg's tree and I didn't find out in time, that
  commit is in your tree now so I might send that along once this is
  merged.

  I also had the accidental misfortune to have access to a Skylake on my
  desk for a few days, and I've had to encourage Intel to try harder,
  which seems to be happening now.

  Here is the main drm-next pull request for 4.4.

  Highlights:

  New driver:
        vc4 driver for the Rasberry Pi VPU.
        (From Eric Anholt at Broadcom.)

  Core:
        Atomic fbdev support
        Atomic helpers for runtime pm
        dp/aux i2c STATUS_UPDATE handling
        struct_mutex usage cleanups.
        Generic of probing support.

  Documentation:
        Kerneldoc for VGA switcheroo code.
        Rename to gpu instead of drm to reflect scope.

  i915:
        Skylake GuC firmware fixes
        HPD A support
        VBT backlight fallbacks
        Fastboot by default for some systems
        FBC work
        BXT/SKL workarounds
        Skylake deeper sleep state fixes

  amdgpu:
        Enable GPU scheduler by default
        New atombios opcodes
        GPUVM debugging options
        Stoney support.
        Fencing cleanups.

  radeon:
        More efficient CS checking

  nouveau:
        gk20a instance memory handling improvements.
        Improved PGOB detection and GK107 support
        Kepler GDDR5 PLL statbility improvement
        G8x/GT2xx reclock improvements
        new userspace API compatiblity fixes.

  virtio-gpu:
        Add 3D support - qemu 2.5 has it merged for it's gtk backend.

  msm:
        Initial msm88896 (snapdragon 8200)

  exynos:
        HDMI cleanups
        Enable mixer driver byt default
        Add DECON-TV support

  vmwgfx:
        Move to using memremap + fixes.

  rcar-du:
        Add support for R8A7793/4 DU

  armada:
        Remove support for non-component mode
        Improved plane handling
        Power savings while in DPMS off.

  tda998x:
        Remove unused slave encoder support
        Use more HDMI helpers
        Fix EDID read handling

  dwhdmi:
        Interlace video mode support for ipu-v3/dw_hdmi
        Hotplug state fixes
        Audio driver integration

  imx:
        More color formats support.

  tegra:
        Minor fixes/improvements"

[ Merge fixup: remove unused variable 'dev' that had all uses removed in
  commit 4e270f088011: "drm/gem: Drop struct_mutex requirement from
  drm_gem_mmap_obj" ]

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (764 commits)
  drm/vmwgfx: Relax irq locking somewhat
  drm/vmwgfx: Properly flush cursor updates and page-flips
  drm/i915/skl: disable display side power well support for now
  drm/i915: Extend DSL readout fix to BDW and SKL.
  drm/i915: Do graphics device reset under forcewake
  drm/i915: Skip fence installation for objects with rotated views (v4)
  vga_switcheroo: Drop client power state VGA_SWITCHEROO_INIT
  drm/amdgpu: group together common fence implementation
  drm/amdgpu: remove AMDGPU_FENCE_OWNER_MOVE
  drm/amdgpu: remove now unused fence functions
  drm/amdgpu: fix fence fallback check
  drm/amdgpu: fix stoping the scheduler timeout
  drm/amdgpu: cleanup on error in amdgpu_cs_ioctl()
  drm/i915: Fix locking around GuC firmware load
  drm/amdgpu: update Fiji's Golden setting
  drm/amdgpu: update Fiji's rev id
  drm/amdgpu: extract common code in vi_common_early_init
  drm/amd/scheduler: don't oops on failure to load
  drm/amdgpu: don't oops on failure to load (v2)
  drm/amdgpu: don't VT switch on suspend
  ...

1 files changed, 30 insertions, 16 deletions

diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
index 047cb0433ccb..b532faa8026d 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
@@ -452,15 +452,19 @@ static void read_hw_revision(struct mdp5_kms *mdp5_kms,
 }
 
 static int get_clk(struct platform_device *pdev, struct clk **clkp,
-                const char *name)
+                const char *name, bool mandatory)
 {
         struct device *dev = &pdev->dev;
         struct clk *clk = devm_clk_get(dev, name);
-        if (IS_ERR(clk)) {
+        if (IS_ERR(clk) && mandatory) {
                 dev_err(dev, "failed to get %s (%ld)\n", name, PTR_ERR(clk));
                 return PTR_ERR(clk);
         }
-        *clkp = clk;
+        if (IS_ERR(clk))
+                DBG("skipping %s", name);
+        else
+                *clkp = clk;
+
         return 0;
 }
 
@@ -514,25 +518,26 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev)
                 goto fail;
         }
 
-        ret = get_clk(pdev, &mdp5_kms->axi_clk, "bus_clk");
+        /* mandatory clocks: */
+        ret = get_clk(pdev, &mdp5_kms->axi_clk, "bus_clk", true);
         if (ret)
                 goto fail;
-        ret = get_clk(pdev, &mdp5_kms->ahb_clk, "iface_clk");
+        ret = get_clk(pdev, &mdp5_kms->ahb_clk, "iface_clk", true);
         if (ret)
                 goto fail;
-        ret = get_clk(pdev, &mdp5_kms->src_clk, "core_clk_src");
+        ret = get_clk(pdev, &mdp5_kms->src_clk, "core_clk_src", true);
         if (ret)
                 goto fail;
-        ret = get_clk(pdev, &mdp5_kms->core_clk, "core_clk");
+        ret = get_clk(pdev, &mdp5_kms->core_clk, "core_clk", true);
         if (ret)
                 goto fail;
-        ret = get_clk(pdev, &mdp5_kms->lut_clk, "lut_clk");
-        if (ret)
-                DBG("failed to get (optional) lut_clk clock");
-        ret = get_clk(pdev, &mdp5_kms->vsync_clk, "vsync_clk");
+        ret = get_clk(pdev, &mdp5_kms->vsync_clk, "vsync_clk", true);
         if (ret)
                 goto fail;
 
+        /* optional clocks: */
+        get_clk(pdev, &mdp5_kms->lut_clk, "lut_clk", false);
+
         /* we need to set a default rate before enabling.  Set a safe
          * rate first, then figure out hw revision, and then set a
          * more optimal rate:
@@ -549,15 +554,23 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev)
         }
 
         config = mdp5_cfg_get_config(mdp5_kms->cfg);
+        mdp5_kms->caps = config->hw->mdp.caps;
 
         /* TODO: compute core clock rate at runtime */
         clk_set_rate(mdp5_kms->src_clk, config->hw->max_clk);
 
-        mdp5_kms->smp = mdp5_smp_init(mdp5_kms->dev, &config->hw->smp);
-        if (IS_ERR(mdp5_kms->smp)) {
-                ret = PTR_ERR(mdp5_kms->smp);
-                mdp5_kms->smp = NULL;
-                goto fail;
+        /*
+         * Some chipsets have a Shared Memory Pool (SMP), while others
+         * have dedicated latency buffering per source pipe instead;
+         * this section initializes the SMP:
+         */
+        if (mdp5_kms->caps & MDP_CAP_SMP) {
+                mdp5_kms->smp = mdp5_smp_init(mdp5_kms->dev, &config->hw->smp);
+                if (IS_ERR(mdp5_kms->smp)) {
+                        ret = PTR_ERR(mdp5_kms->smp);
+                        mdp5_kms->smp = NULL;
+                        goto fail;
+                }
         }
 
         mdp5_kms->ctlm = mdp5_ctlm_init(dev, mdp5_kms->mmio, mdp5_kms->cfg);
@@ -586,6 +599,7 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev)
                 if (IS_ERR(mmu)) {
                         ret = PTR_ERR(mmu);
                         dev_err(dev->dev, "failed to init iommu: %d\n", ret);
+                        iommu_domain_free(config->platform.iommu);
                         goto fail;
                 }