From patchwork Thu Dec 19 21:12:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 3384451 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E1CE39F32E for ; Thu, 19 Dec 2013 21:13:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 163CA20678 for ; Thu, 19 Dec 2013 21:13:05 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 146BF20675 for ; Thu, 19 Dec 2013 21:13:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 22A3F10EC76; Thu, 19 Dec 2013 13:13:01 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qe0-f47.google.com (mail-qe0-f47.google.com [209.85.128.47]) by gabe.freedesktop.org (Postfix) with ESMTP id 93D3F10EC79 for ; Thu, 19 Dec 2013 13:12:44 -0800 (PST) Received: by mail-qe0-f47.google.com with SMTP id t7so1616319qeb.34 for ; Thu, 19 Dec 2013 13:12:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZXVN+x3IyBwvJS8LIRQuGfHdmqPbSJnuPDmRUAdfThg=; b=xLFXAxhbjdgdD0uDWuZScUSkCVonnonsKi87ISs3kSDfmzYX5b//wDXZcdV5afAGgt ukeM70hGl1WgZGFLaXjHBiNAOQKVQniUueLVEPMFD2TZchnaVizww/UqgnJZCptDhne/ l8lmA+kpEV7Ehm5zObnEIj7gOnRDS9lpVvpg4cj/8IDsyxFobePA8N9mybxnKGM7C1Hv addnDgXfQpwY5mOrVpgYdVDcVkPcW9VC+RfFNcjEN/99TYKf5VwAzId0sN8J8LkSCW2U mdi1Q/Ud8GEvqDvgDfA7ysn7WTvTslo/IJe5gO2J4BinHKiK/0h0gXSqKgPBEZbn1SuO EZyA== X-Received: by 10.229.13.133 with SMTP id c5mr7298429qca.22.1387487563985; Thu, 19 Dec 2013 13:12:43 -0800 (PST) Received: from localhost.localdomain ([177.40.53.102]) by mx.google.com with ESMTPSA id gf3sm2574254qeb.17.2013.12.19.13.12.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Dec 2013 13:12:43 -0800 (PST) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Thu, 19 Dec 2013 19:12:30 -0200 Message-Id: <1387487551-1612-2-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1387487551-1612-1-git-send-email-przanoni@gmail.com> References: <1387487551-1612-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 2/3] drm/i915: don't wait for vblank after enabling pipe on HSW 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@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Paulo Zanoni Because on Haswell, the pipe is never running at this point, so we hit the 50ms timeout waiting for nothing. We already have two other places where we wait for vblanks on haswell_crtc_enable, so we're safe. This gets us rid of one instance of "vblank wait timed out" for each mode set, which means driver init and resume are also 50ms faster. Signed-off-by: Paulo Zanoni Reviewed-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 6865fa2..f0f78d3 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -3706,7 +3706,7 @@ static void haswell_crtc_enable(struct drm_crtc *crtc) intel_update_watermarks(crtc); intel_enable_pipe(dev_priv, pipe, - intel_crtc->config.has_pch_encoder, false, true); + intel_crtc->config.has_pch_encoder, false, false); if (intel_crtc->config.has_pch_encoder) lpt_pch_enable(crtc);