From patchwork Mon Nov 26 16:22:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1803891 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id D52ABDF2EB for ; Mon, 26 Nov 2012 17:08:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A519DE61D3 for ; Mon, 26 Nov 2012 09:08:40 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com [74.125.83.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 5EEDDE617B for ; Mon, 26 Nov 2012 08:31:54 -0800 (PST) Received: by mail-ee0-f49.google.com with SMTP id c4so4657995eek.36 for ; Mon, 26 Nov 2012 08:31:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=OgKQKkH3N1YXIjR0FArS7Z38o0RpJIxQlomahu4rEHU=; b=lUp3nt9XdbUB7Tyfqx1Rmz3+BiaV4DgLXV1/ZSLMCrZCudijYTpxDz266OdK1wb6jy hFnHaZ4tRyxszKBrSZzNTgl7otSudatcX9nIbiKecI0/nWPkUdlHubssfNP6XHLg0TXC LLnRZvsL0pWLJQ8F+O18+A7CLODhNMb8u3vYI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=OgKQKkH3N1YXIjR0FArS7Z38o0RpJIxQlomahu4rEHU=; b=hA+tH5D4ql/a06SnNc+e+1pFchMrodXva3E4U/VSndKJMH4AlUQzcLdtnYru3/ougH VFmmTGNIJ0jWJipTItIkV9RxeXLgibaMp2UBfvjfjGcSvCEhh5EGDHFMOT3p5jgyQ1+f Q+VasbnojMsGqm0tzw02IstPKWxVK2NGDxP5Ppf+qguH74aBBbwCq/2gRvIruNlRuX/F VJHCMrr5aVrtmWn9gidLpnZFc+XYbfHo9o02itmhZrgF5Bj9ZtYNDNp8QlE9PCscMbbO Ix+jJaLLSfdP2l0X+IUF/KdiV5/dx6yMdTNi+aN6KkLDmxZCwzOa7KXeurWM46kIosuD OyuA== Received: by 10.14.173.69 with SMTP id u45mr23802872eel.21.1353947514250; Mon, 26 Nov 2012 08:31:54 -0800 (PST) Received: from wespe.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id f49sm4255021eep.12.2012.11.26.08.31.52 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 26 Nov 2012 08:31:53 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development Date: Mon, 26 Nov 2012 17:22:21 +0100 Message-Id: <1353946943-18745-16-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1353946943-18745-1-git-send-email-daniel.vetter@ffwll.ch> References: <1353946943-18745-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQkyZXBExUMhZFXYI+5eLCgy3cDW06jB4n0DH6pGuWenh+vzeboNR/0CeHMFLPzzzJz6kcr+ Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 15/17] drm/i915: don't call update_watermark in crtc_mode_set X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@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 1ab4592..bd6b409 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4711,8 +4711,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; } @@ -5382,8 +5380,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; @@ -5467,8 +5463,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;