From: Paulo Zanoni <paulo.r.zanoni@intel.com>
Date: Fri, 3 May 2013 20:23:37 +0000 (-0300)
Subject: drm/i915: ILK, SNB and IVB don't have linetime watermarks
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=5a41254eac1137d0335c0aed7b00f1f3138ee9ca;p=deliverable%2Flinux.git

drm/i915: ILK, SNB and IVB don't have linetime watermarks

So don't call intel_update_linetime_watermarks from
ironlake_crtc_mode_set. Only Haswell has these watermarks.

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>
---

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 4196155cf964..c7bdbcb6a675 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5841,8 +5841,6 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
 
 	intel_update_watermarks(dev);
 
-	intel_update_linetime_watermarks(dev, pipe, adjusted_mode);
-
 	return ret;
 }