diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-08-08 16:16:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-08-08 16:16:26 +1000 |
| commit | e8285cec4e6d6500d1ac25ec81ced56deffdb1fb (patch) | |
| tree | 71a4c84232d4b0c16a74c939f975ff30016d4e18 /drivers/gpu/drm/i915/intel_pm.c | |
| parent | 5c6c201ccbaf9d3901f829441d457293f7ca8ef4 (diff) | |
| parent | c45eb4fed12d278d3619f1904885bd0d7bcbf036 (diff) | |
Merge tag 'drm-intel-next-fixes-2016-08-05' of git://anongit.freedesktop.org/drm-intel into drm-next
3 intel fixes.
* tag 'drm-intel-next-fixes-2016-08-05' of git://anongit.freedesktop.org/drm-intel:
drm/i915/fbdev: Check for the framebuffer before use
drm/i915: Never fully mask the the EI up rps interrupt on SNB/IVB
drm/i915: Wait up to 3ms for the pcu to ack the cdclk change request on SKL
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index f4f3fcc8b3be..97ba6c8cf907 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4892,7 +4892,8 @@ void gen6_rps_idle(struct drm_i915_private *dev_priv) else gen6_set_rps(dev_priv, dev_priv->rps.idle_freq); dev_priv->rps.last_adj = 0; - I915_WRITE(GEN6_PMINTRMSK, 0xffffffff); + I915_WRITE(GEN6_PMINTRMSK, + gen6_sanitize_rps_pm_mask(dev_priv, ~0)); } mutex_unlock(&dev_priv->rps.hw_lock); |