| From 31c34ee116fd52a7461bba195c74d5bff1563774 Mon Sep 17 00:00:00 2001 |
| From: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Date: Fri, 3 May 2013 17:23:37 -0300 |
| Subject: drm/i915: ILK, SNB and IVB don't have linetime watermarks |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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> |
| (cherry picked from commit 5a41254eac1137d0335c0aed7b00f1f3138ee9ca) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c |
| index d2a01268443b..95dc839be850 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; |
| } |
| |
| -- |
| 1.8.5.rc3 |
| |
