[Intel-gfx] [PATCH 5/9] drm/i915: Don't initialize watermark stuff with PCH_NOP

[Ben Widawsky]

Signed-off-by: Ben Widawsky <b...@bwidawsk.net>
---
 drivers/gpu/drm/i915/intel_pm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 52203fd..3166aa4 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4175,7 +4175,7 @@ void intel_init_pm(struct drm_device *dev)
                        dev_priv->display.init_clock_gating = 
gen6_init_clock_gating;
                } else if (IS_IVYBRIDGE(dev)) {
                        /* FIXME: detect B0+ stepping and use auto training */
-                       if (SNB_READ_WM0_LATENCY()) {
+                       if (SNB_READ_WM0_LATENCY() && !HAS_PCH_NOP(dev)) {
                                dev_priv->display.update_wm = 
ivybridge_update_wm;
                                dev_priv->display.update_sprite_wm = 
sandybridge_update_sprite_wm;
                        } else {
-- 
1.8.1.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx