From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH 09/10] drm/i915: don't call update_watermarks from haswell enable/disable code Date: Thu, 29 Nov 2012 15:59:38 +0100 Message-ID: <1354201179-14975-9-git-send-email-daniel.vetter@ffwll.ch> References: <1354201179-14975-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com [74.125.83.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 9BCFFE5FFA for ; Thu, 29 Nov 2012 07:09:07 -0800 (PST) Received: by mail-ee0-f49.google.com with SMTP id c4so6529144eek.36 for ; Thu, 29 Nov 2012 07:09:07 -0800 (PST) In-Reply-To: <1354201179-14975-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Intel Graphics Development Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org We don't use these on haswell, since haswell as per-pipe watermarks and nothing global any more. Signed-off-by: Daniel Vetter --- 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 bb42102..0a45d07 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3357,7 +3357,6 @@ static void haswell_crtc_enable(struct drm_crtc *crtc) return; intel_crtc->active = true; - intel_update_watermarks(dev); is_pch_port = haswell_crtc_driving_pch(crtc); @@ -3546,7 +3545,6 @@ static void haswell_crtc_disable(struct drm_crtc *crtc) } intel_crtc->active = false; - intel_update_watermarks(dev); mutex_lock(&dev->struct_mutex); intel_update_fbc(dev); -- 1.7.11.7