diff options
| author | Paulo Zanoni | 2013-05-03 22:23:44 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2013-05-21 12:00:26 +0200 |
| commit | 3e1f72664e0a8a31e9b90c48459deb6642fd52f3 (patch) | |
| tree | cf20d09a07accd98b0e81f94072b9e7fd8c737bb /drivers/gpu/drm/i915/intel_pm.c | |
| parent | drm/i915: set the IPS linetime watermark (diff) | |
| download | kernel-qcow2-linux-3e1f72664e0a8a31e9b90c48459deb6642fd52f3.tar.gz kernel-qcow2-linux-3e1f72664e0a8a31e9b90c48459deb6642fd52f3.tar.xz kernel-qcow2-linux-3e1f72664e0a8a31e9b90c48459deb6642fd52f3.zip | |
drm/i915: MCH_SSKPD is a 64 bit register on Haswell
And the SNB_READ_WM0_LATENCY macro is not valid anymore because we
have the "New WM0" at 63:56, so the "Old WM0" could maybe be zero if
the new one is not zero.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index ad1d35526a8f..912ab4d8d722 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4633,7 +4633,7 @@ void intel_init_pm(struct drm_device *dev) } dev_priv->display.init_clock_gating = ivybridge_init_clock_gating; } else if (IS_HASWELL(dev)) { - if (SNB_READ_WM0_LATENCY()) { + if (I915_READ64(MCH_SSKPD)) { dev_priv->display.update_wm = haswell_update_wm; dev_priv->display.update_sprite_wm = sandybridge_update_sprite_wm; } else { |