Merge tag 'sound-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

Pull sound fixes from Takashi Iwai:
 "The significant part here is a few security fixes for ALSA core
  control API by Lars.  Besides that, there are a few fixes for ASoC
  sigmadsp (again by Lars) for building properly, and small fixes for
  ASoC rsnd, MMP, PXA and FSL, in addition to a fix for bogus WARNING in
  i915/HD-audio binding"

* tag 'sound-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: control: Make sure that id->index does not overflow
  ALSA: control: Handle numid overflow
  ALSA: control: Don't access controls outside of protected regions
  ALSA: control: Fix replacing user controls
  ALSA: control: Protect user controls against concurrent access
  drm/i915, HD-audio: Don't continue probing when nomodeset is given
  ASoC: fsl: Fix build problem
  ASoC: rsnd: fixup index of src/dst mod when capture
  ASoC: fsl_spdif: Fix integer overflow when calculating divisors
  ASoC: fsl_spdif: Fix incorrect usage of regmap_read()
  ASoC: dapm: Make sure register value is in sync with DAPM kcontrol state
  ASoC: sigmadsp: Split regmap and I2C support into separate modules
  ASoC: MMP audio needs sram support
  ASoC: pxa: add I2C dependencies as needed

diff --combined drivers/gpu/drm/i915/intel_pm.c
index 769caea97c2105c799bedcf3780829cca62c8cb4,6463f0201cf225dd095cb7c5f97b534c17b2141c..54242e4f6f4c8cebe2722ca20db0e609fe3c1465
--- 1/drivers/gpu/drm/i915/intel_pm.c
--- 2/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@@ -511,7 -511,8 +511,7 @@@ void intel_update_fbc(struct drm_devic
        obj = intel_fb->obj;
        adjusted_mode = &intel_crtc->config.adjusted_mode;
  
 -      if (i915.enable_fbc < 0 &&
 -          INTEL_INFO(dev)->gen <= 7 && !IS_HASWELL(dev)) {
 +      if (i915.enable_fbc < 0) {
                if (set_no_fbc_reason(dev_priv, FBC_CHIP_DEFAULT))
                        DRM_DEBUG_KMS("disabled per chip default\n");
                goto out_disable;
@@@ -3505,11 -3506,15 +3505,11 @@@ static void gen8_enable_rps(struct drm_
  
        I915_WRITE(GEN6_RP_IDLE_HYSTERSIS, 10);
  
 -      /* WaDisablePwrmtrEvent:chv (pre-production hw) */
 -      I915_WRITE(0xA80C, I915_READ(0xA80C) & 0x00ffffff);
 -      I915_WRITE(0xA810, I915_READ(0xA810) & 0xffffff00);
 -
        /* 5: Enable RPS */
        I915_WRITE(GEN6_RP_CONTROL,
                   GEN6_RP_MEDIA_TURBO |
                   GEN6_RP_MEDIA_HW_NORMAL_MODE |
 -                 GEN6_RP_MEDIA_IS_GFX | /* WaSetMaskForGfxBusyness:chv (pre-production hw ?) */
 +                 GEN6_RP_MEDIA_IS_GFX |
                   GEN6_RP_ENABLE |
                   GEN6_RP_UP_BUSY_AVG |
                   GEN6_RP_DOWN_IDLE_AVG);
@@@ -6019,30 -6024,32 +6019,32 @@@ void intel_display_power_put(struct drm
  static struct i915_power_domains *hsw_pwr;
  
  /* Display audio driver power well request */
- void i915_request_power_well(void)
+ int i915_request_power_well(void)
  {
        struct drm_i915_private *dev_priv;
  
-       if (WARN_ON(!hsw_pwr))
-               return;
+       if (!hsw_pwr)
+               return -ENODEV;
  
        dev_priv = container_of(hsw_pwr, struct drm_i915_private,
                                power_domains);
        intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO);
+       return 0;
  }
  EXPORT_SYMBOL_GPL(i915_request_power_well);
  
  /* Display audio driver power well release */
- void i915_release_power_well(void)
+ int i915_release_power_well(void)
  {
        struct drm_i915_private *dev_priv;
  
-       if (WARN_ON(!hsw_pwr))
-               return;
+       if (!hsw_pwr)
+               return -ENODEV;
  
        dev_priv = container_of(hsw_pwr, struct drm_i915_private,
                                power_domains);
        intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO);
+       return 0;
  }
  EXPORT_SYMBOL_GPL(i915_release_power_well);