From patchwork Thu May 7 18:56:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 6360571 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 48B5FBEEE1 for ; Thu, 7 May 2015 18:57:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6D72D20303 for ; Thu, 7 May 2015 18:57:32 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id EC11A20376 for ; Thu, 7 May 2015 18:57:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8536F7213D; Thu, 7 May 2015 11:57:30 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qk0-f173.google.com (mail-qk0-f173.google.com [209.85.220.173]) by gabe.freedesktop.org (Postfix) with ESMTP id 284726E88F for ; Thu, 7 May 2015 11:57:28 -0700 (PDT) Received: by qku63 with SMTP id 63so33957882qku.3 for ; Thu, 07 May 2015 11:57:27 -0700 (PDT) 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=Z1Sr8fdCYkCvqPGFcs0lFru+KZGI0cE9KGg4WnO+M0k=; b=F9ondRA5Ldd5t8JKwLu9kj/Jjlivw14+vdYUm0w2620oRb8/pKd2UDkuMTs/sQSloa g1PxLATavIlnCDWTQtzhTbMSBQVf2S2Y6tWYgkdj8vEPjIuTtuDx7vwIJH+51cTrYgqA oh0RNe5SuIpPMb+uNJZl5lfvcVXhTMgELAYTVH294tSui7tpt4b1mPiCDN1Av85qS+oA CQnurF08umqejpeKCquwrM/12PKUY/t6WQDw2CreBY+m9M7It3vWCUnI2dJ1RaxuikBX 4UrwZ+nVfvgZOmaoBVo8/J8Smoo2ZhejeTshm59DwX4Wfobaa0Uc+Ivn/OZpS2XrkFaX IEew== X-Received: by 10.55.25.5 with SMTP id k5mr92113qkh.35.1431025047845; Thu, 07 May 2015 11:57:27 -0700 (PDT) Received: from localhost.localdomain ([187.121.142.45]) by mx.google.com with ESMTPSA id a8sm1955331qkh.43.2015.05.07.11.57.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 May 2015 11:57:27 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Thu, 7 May 2015 15:56:30 -0300 Message-Id: <1431024996-2267-3-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1431024996-2267-1-git-send-email-przanoni@gmail.com> References: <1431024996-2267-1-git-send-email-przanoni@gmail.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH igt 2/8] tests/kms_fbc_crc: increase the FBC wait timeout X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 Now that we moved to the frontbuffer tracking scheme, it may take a long time for FBC to be updated after it is invalidated: 300ms is not enough anymore. The problem starts when i915_gem_execbuffer2() indirectly calls intel_fb_obj_invalidate(), which disables FBC. After this, FBC only gets reenabled when i915_gem_retire_work_handler() happens and indirectly calls intel_frontbuffer_flush(). Notice that while FBC is not yet enabled, the screen contents are correct, so this shouldn't really be a bug. Previous versions of this patch were replacing the gem_bo_busy() calls with gem_sync(), but after some discussion we concluded this was not the correct way to handle the problem, so let's just increase the timeout so we can kill those subtest failures. Signed-off-by: Paulo Zanoni --- tests/kms_fbc_crc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/kms_fbc_crc.c b/tests/kms_fbc_crc.c index 6022a6a..af4c370 100644 --- a/tests/kms_fbc_crc.c +++ b/tests/kms_fbc_crc.c @@ -204,7 +204,7 @@ static bool fbc_enabled(data_t *data) static bool wait_for_fbc_enabled(data_t *data) { - return igt_wait(fbc_enabled(data), 300, 30); + return igt_wait(fbc_enabled(data), 3000, 30); } static void test_crc(data_t *data, enum test_mode mode)