From patchwork Thu Nov 29 14:59:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1821691 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 CF38DDF23A for ; Thu, 29 Nov 2012 15:14:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 96708E5FFA for ; Thu, 29 Nov 2012 07:14:59 -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 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) 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=7DtsDHDsGMWJOfoEPf2UOm9QZH8J4Xf0mHi1Cn1BWyo=; b=WJlwMlKRjQfL8jIPipbIlQlYMucc19aSgARcskY9G4+3q57+T1jkhNY23aXEXap9vc JyeepKl5RMungNiJwwl5LyWyPMfnp8gcKrWW703dDd88+W0NfXLHI29IMC8EZDRANB5V O2Hm+IsYHegIzJsSvuUiz5KewVcih/cIgyUdk= 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=7DtsDHDsGMWJOfoEPf2UOm9QZH8J4Xf0mHi1Cn1BWyo=; b=atoyl8zSZ4zBmQ+fHeR+ajNBJvUQFUjQMaogRlKD+N92wz9CCg5J6VKBv3WACseoVp OiceMnaBFXEQzq8ubVcP10XuPWVk9MxQP78cXjEeBwKv4/3b190axSgjzY2ldTqFBy8v imJ0JHIOp5n+bScy4tcL9YIDuLkb+0s7gqoTg5+zE2uqnZT+iGzqcASUqY2UPUtGnDG6 6QFcH6kHwypNDHUy3QyS5sQH5LhQ4ZhYsodwDxSeN0Rrlb70GiENhuc+i48wWqFZpQMh SRTM6QhpdgXnuDbf3RS9J16TMek/tc7lkUi6NjjRK//rpd8RXmNq4Y0tm2nGylR4GDLi /lEg== Received: by 10.14.203.132 with SMTP id f4mr83172815eeo.11.1354201747393; Thu, 29 Nov 2012 07:09:07 -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 b2sm4108893eep.9.2012.11.29.07.09.06 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 29 Nov 2012 07:09:06 -0800 (PST) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 29 Nov 2012 15:59:38 +0100 Message-Id: <1354201179-14975-9-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1354201179-14975-1-git-send-email-daniel.vetter@ffwll.ch> References: <1354201179-14975-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQm6djanR/YD0AuW+ajH//sPi0kwpW5j+QQDSHQlZb0F5Ws/V7d5NYwWnSzjtHAjxE8s6Lj1 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 09/10] drm/i915: don't call update_watermarks from haswell enable/disable code 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 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);