diff options
| author | Dave Airlie <airlied@gmail.com> | 2014-07-06 07:49:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2014-07-06 07:49:59 +1000 |
| commit | dfd7aecfd6d227831d77719379d4c7137f444fee (patch) | |
| tree | 9ddf609cb0ac13555dce0930fe93c6e951352e0e /drivers/gpu/drm/i915/intel_pm.c | |
| parent | 80e6e6b1764023ac1fba41e22a8503245b0fa573 (diff) | |
| parent | 5549d25f642a7e6cfb8744d0031a9da404f696d6 (diff) | |
| download | op-kernel-dev-dfd7aecfd6d227831d77719379d4c7137f444fee.zip op-kernel-dev-dfd7aecfd6d227831d77719379d4c7137f444fee.tar.gz | |
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
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 61cb90e..ee728070 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -3209,6 +3209,14 @@ void gen6_set_rps(struct drm_device *dev, u8 val) */ 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. */ |
