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

Pull drm tree changes from Dave Airlie:
 "This is the main drm pull request, I have some overlap with sound and
  arm-soc, the sound patch is acked and may conflict based on -next
  reports but should be a trivial fixup, which I'll leave to you!

  Highlights:

   - new drivers:

     MSM driver from Rob Clark

   - non-drm:

     switcheroo and hdmi audio driver support for secondary GPU
     poweroff, so drivers can use runtime PM to poweroff the GPUs.  This
     can save 5 or 6W on some optimus laptops.

   - drm core:

     combined GEM and TTM VMA manager
     per-filp mmap permission tracking
     initial rendernode support (via a runtime enable for now, until we get api stable),
     remove old proc support,
     lots of cleanups of legacy code
     hdmi vendor infoframes and 4k modes
     lots of gem/prime locking and races fixes
     async pageflip scaffolding
     drm bridge objects

   - i915:

     Haswell PC8+ support and eLLC support, HDMI 4K support, initial
     per-process VMA pieces, watermark reworks, convert to generic hdmi
     infoframes, encoder reworking, fastboot support,

   - radeon:

     CIK PM support, remove 3d blit code in favour of DMA engines,
     Berlin GPU support, HDMI audio fixes

   - nouveau:

     secondary GPU power down support for optimus laptops, lots of
     fixes, use MSI, VP3 engine support

   - exynos:

     runtime pm support for g2d, DT support, remove non-DT,

   - tda998x i2c driver:

     lots of fixes for sync issues

   - gma500:

     lots of cleanups

   - rcar:

     add LVDS support, fbdev emulation,

   - tegra:

     just minor fixes"

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (684 commits)
  drm/exynos: Fix build error with exynos_drm_connector.c
  drm/exynos: Remove non-DT support in exynos_drm_fimd
  drm/exynos: Remove non-DT support in exynos_hdmi
  drm/exynos: Remove non-DT support in exynos_drm_g2d
  drm/exynos: Remove non-DT support in exynos_hdmiphy
  drm/exynos: Remove non-DT support in exynos_ddc
  drm/exynos: Make Exynos DRM drivers depend on OF
  drm/exynos: Consider fallback option to allocation fail
  drm/exynos: fimd: move platform data parsing to separate function
  drm/exynos: fimd: get signal polarities from device tree
  drm/exynos: fimd: replace struct fb_videomode with videomode
  drm/exynos: check a pixel format to a particular window layer
  drm/exynos: fix fimd pixel format setting
  drm/exynos: Add NULL pointer check
  drm/exynos: Remove redundant error messages
  drm/exynos: Add missing of.h header include
  drm/exynos: Remove redundant NULL check in exynos_drm_buf
  drm/exynos: add device tree support for rotator
  drm/exynos: Add missing includes
  drm/exynos: add runtime pm interfaces to g2d driver
  ...

1 files changed, 32 insertions, 4 deletions

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index c6c98298ac39..e54ebd530849 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -555,6 +555,9 @@ struct azx {
 #ifdef CONFIG_SND_HDA_DSP_LOADER
         struct azx_dev saved_azx_dev;
 #endif
+
+        /* secondary power domain for hdmi audio under vga device */
+        struct dev_pm_domain hdmi_pm_domain;
 };
 
 #define CREATE_TRACE_POINTS
@@ -1397,8 +1400,9 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id)
         int i, ok;
 
 #ifdef CONFIG_PM_RUNTIME
-        if (chip->pci->dev.power.runtime_status != RPM_ACTIVE)
-                return IRQ_NONE;
+        if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
+                if (chip->pci->dev.power.runtime_status != RPM_ACTIVE)
+                        return IRQ_NONE;
 #endif
 
         spin_lock(&chip->reg_lock);
@@ -1409,7 +1413,7 @@ static irqreturn_t azx_interrupt(int irq, void *dev_id)
         }
 
         status = azx_readl(chip, INTSTS);
-        if (status == 0) {
+        if (status == 0 || status == 0xffffffff) {
                 spin_unlock(&chip->reg_lock);
                 return IRQ_NONE;
         }
@@ -2971,6 +2975,12 @@ static int azx_runtime_suspend(struct device *dev)
         struct snd_card *card = dev_get_drvdata(dev);
         struct azx *chip = card->private_data;
 
+        if (chip->disabled)
+                return 0;
+
+        if (!(chip->driver_caps & AZX_DCAPS_PM_RUNTIME))
+                return 0;
+
         /* enable controller wake up event */
         azx_writew(chip, WAKEEN, azx_readw(chip, WAKEEN) |
                   STATESTS_INT_MASK);
@@ -2991,6 +3001,12 @@ static int azx_runtime_resume(struct device *dev)
         struct hda_codec *codec;
         int status;
 
+        if (chip->disabled)
+                return 0;
+
+        if (!(chip->driver_caps & AZX_DCAPS_PM_RUNTIME))
+                return 0;
+
         if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
                 hda_display_power(true);
 
@@ -3020,6 +3036,9 @@ static int azx_runtime_idle(struct device *dev)
         struct snd_card *card = dev_get_drvdata(dev);
         struct azx *chip = card->private_data;
 
+        if (chip->disabled)
+                return 0;
+
         if (!power_save_controller ||
             !(chip->driver_caps & AZX_DCAPS_PM_RUNTIME))
                 return -EBUSY;
@@ -3102,13 +3121,19 @@ static void azx_vs_set_state(struct pci_dev *pci,
                            "%s: %s via VGA-switcheroo\n", pci_name(chip->pci),
                            disabled ? "Disabling" : "Enabling");
                 if (disabled) {
+                        pm_runtime_put_sync_suspend(&pci->dev);
                         azx_suspend(&pci->dev);
+                        /* when we get suspended by vga switcheroo we end up in D3cold,
+                         * however we have no ACPI handle, so pci/acpi can't put us there,
+                         * put ourselves there */
+                        pci->current_state = PCI_D3cold;
                         chip->disabled = true;
                         if (snd_hda_lock_devices(chip->bus))
                                 snd_printk(KERN_WARNING SFX "%s: Cannot lock devices!\n",
                                            pci_name(chip->pci));
                 } else {
                         snd_hda_unlock_devices(chip->bus);
+                        pm_runtime_get_noresume(&pci->dev);
                         chip->disabled = false;
                         azx_resume(&pci->dev);
                 }
@@ -3163,6 +3188,9 @@ static int register_vga_switcheroo(struct azx *chip)
         if (err < 0)
                 return err;
         chip->vga_switcheroo_registered = 1;
+
+        /* register as an optimus hdmi audio power domain */
+        vga_switcheroo_init_domain_pm_optimus_hdmi_audio(&chip->pci->dev, &chip->hdmi_pm_domain);
         return 0;
 }
 #else
@@ -3913,7 +3941,7 @@ static int azx_probe_continue(struct azx *chip)
         power_down_all_codecs(chip);
         azx_notifier_register(chip);
         azx_add_card_list(chip);
-        if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)
+        if ((chip->driver_caps & AZX_DCAPS_PM_RUNTIME) || chip->use_vga_switcheroo)
                 pm_runtime_put_noidle(&pci->dev);
 
         return 0;