Merge tag 'drm-intel-fixes-2014-07-03' of git://anongit.freedesktop.org/drm-intel

Fixes for 3.16-rc3; most importantly Jesse brings back VGA he took away
on a bunch of machines. Also a vblank fix for BDW and a power workaround
fix for VLV.

* tag 'drm-intel-fixes-2014-07-03' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Drop early VLV WA to fix Voltage not getting dropped to Vmin
  drm/i915: only apply crt_present check on VLV
  drm/i915: Wait for vblank after enabling the primary plane on BDW

diff --combined drivers/gpu/drm/i915/intel_pm.c
index 61cb90e729a608b6d7d7aae97d2efaa7ebb3152e,c8bb7616e07756ea4539ef03356110ccc811140c..ee72807069e4ad54a4b8ac2b4d8e601d6127abaa
--- 1/drivers/gpu/drm/i915/intel_pm.c
--- 2/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@@ -3209,6 -3209,14 +3209,14 @@@ void gen6_set_rps(struct drm_device *de
  */
  static void vlv_set_rps_idle(struct drm_i915_private *dev_priv)
  {
+       struct drm_device *dev = dev_priv->dev;
+ 
+       /* Latest VLV doesn't need to force the gfx clock */
+       if (dev->pdev->revision >= 0xd) {
+               valleyview_set_rps(dev_priv->dev, dev_priv->rps.min_freq_softlimit);
+               return;
+       }
+ 
        /*
         * When we are idle.  Drop to min voltage state.
         */
@@@ -6038,27 -6046,6 +6046,27 @@@ int i915_release_power_well(void
  }
  EXPORT_SYMBOL_GPL(i915_release_power_well);
  
 +/*
 + * Private interface for the audio driver to get CDCLK in kHz.
 + *
 + * Caller must request power well using i915_request_power_well() prior to
 + * making the call.
 + */
 +int i915_get_cdclk_freq(void)
 +{
 +      struct drm_i915_private *dev_priv;
 +
 +      if (!hsw_pwr)
 +              return -ENODEV;
 +
 +      dev_priv = container_of(hsw_pwr, struct drm_i915_private,
 +                              power_domains);
 +
 +      return intel_ddi_get_cdclk_freq(dev_priv);
 +}
 +EXPORT_SYMBOL_GPL(i915_get_cdclk_freq);
 +
 +
  #define POWER_DOMAIN_MASK (BIT(POWER_DOMAIN_NUM) - 1)
  
  #define HSW_ALWAYS_ON_POWER_DOMAINS (                 \