From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH 08/10] drm/i915: don't call update_watermark in crtc_mode_set Date: Thu, 29 Nov 2012 15:59:37 +0100 Message-ID: <1354201179-14975-8-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 501D5E5FFA for ; Thu, 29 Nov 2012 07:09:06 -0800 (PST) Received: by mail-ee0-f49.google.com with SMTP id c4so6529153eek.36 for ; Thu, 29 Nov 2012 07:09:06 -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 already update watermarks at all the right places in the crtc_enable/disable callbacks. And since ->mode_set doesn't change the active state, nothing will have changed ... v2: Rebase on top of latest haswell copy&pasta. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 9e13636..bb42102 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4713,8 +4713,6 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc, ret = intel_pipe_set_base(crtc, x, y, fb); - intel_update_watermarks(dev); - return ret; } @@ -5384,8 +5382,6 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, ret = intel_pipe_set_base(crtc, x, y, fb); - intel_update_watermarks(dev); - intel_update_linetime_watermarks(dev, pipe, adjusted_mode); return fdi_config_ok ? ret : -EINVAL; @@ -5471,8 +5467,6 @@ static int haswell_crtc_mode_set(struct drm_crtc *crtc, ret = intel_pipe_set_base(crtc, x, y, fb); - intel_update_watermarks(dev); - intel_update_linetime_watermarks(dev, pipe, adjusted_mode); return ret; -- 1.7.11.7