From patchwork Thu May 7 18:56:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 6360561 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8A3389F1C2 for ; Thu, 7 May 2015 18:57:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 38BEA20392 for ; Thu, 7 May 2015 18:57:30 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5EB1920303 for ; Thu, 7 May 2015 18:57:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A8DA172134; Thu, 7 May 2015 11:57:28 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qk0-f179.google.com (mail-qk0-f179.google.com [209.85.220.179]) by gabe.freedesktop.org (Postfix) with ESMTP id BAF566E88F for ; Thu, 7 May 2015 11:57:26 -0700 (PDT) Received: by qku63 with SMTP id 63so33957374qku.3 for ; Thu, 07 May 2015 11:57:26 -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=MZIOYZiaMWN0/9k9wVOEZ7XOnE8p2TTtTotZvfXpNxg=; b=xxWTRtEFFS0W+SdJUXLoVglTLnCfIkhf1VY0LUeVS+Vnvd7tD9xS4f6Hla4dWrvbhP MwCCkJtFWTOPPkLRsGwuhosQ8m5LSaJAwYIrp5o0B8V4tBdtFNRkWroaine8B6G1/eXz ah+H3izlI3BTT8RBEimgg4vpuHbDSyDFie3iNCsNJph4Ude7Dudl1/nyhC1noyiH44Vx 2it9tYndD7+QY7rnjnPCZcqAwOCow+gr3kw5orWdtWe+0OGGERoYtj9Qyq0d6xuogX/3 GibopuyCCElPk7WZt0+memg6IHiHNTE/4ZIZgFnoXo37ZXcMLTedxAJTM3HskgAuw/Nd 1syA== X-Received: by 10.229.28.9 with SMTP id k9mr80200qcc.9.1431025046302; Thu, 07 May 2015 11:57:26 -0700 (PDT) Received: from localhost.localdomain ([187.121.142.45]) by mx.google.com with ESMTPSA id a8sm1955331qkh.43.2015.05.07.11.57.24 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 May 2015 11:57:25 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Thu, 7 May 2015 15:56:29 -0300 Message-Id: <1431024996-2267-2-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 1/8] tests/kms_fbc_crc: exec_nop() can also invalidate FBC 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 So make sure that, at prepare_test(), we wait for FBC to be enabled again after we run the exec_nop() call. Since after this happens, we just assert fbc_enabled() at test_crc() instead of waiting for it to be enabled. This is now needed because we moved to software frontbuffer tracking, so it can take some considerable time for FBC to be reenabled after it is disabled. A previous version of this patch was just calling gem_sync() after exec_nop(). Signed-off-by: Paulo Zanoni --- tests/kms_fbc_crc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/kms_fbc_crc.c b/tests/kms_fbc_crc.c index 37527d8..6022a6a 100644 --- a/tests/kms_fbc_crc.c +++ b/tests/kms_fbc_crc.c @@ -383,6 +383,7 @@ static bool prepare_test(data_t *data, enum test_mode test_mode) * FBC RT address is left as disabled. */ exec_nop(data, data->fb[0].gem_handle, data->ctx[0]); + igt_assert(wait_for_fbc_enabled(data)); } igt_wait_for_vblank(data->drm_fd, data->pipe);