From patchwork Tue Oct 2 11:26:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 10623403 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 594E416B1 for ; Tue, 2 Oct 2018 11:26:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39AC7287F9 for ; Tue, 2 Oct 2018 11:26:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D35A28801; Tue, 2 Oct 2018 11:26:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C8123287F9 for ; Tue, 2 Oct 2018 11:26:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 44ED46E2F5; Tue, 2 Oct 2018 11:26:20 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 924E66E2F3; Tue, 2 Oct 2018 11:26:18 +0000 (UTC) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 13964695-1500050 for multiple; Tue, 02 Oct 2018 12:26:07 +0100 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Tue, 2 Oct 2018 12:26:01 +0100 Message-Id: <20181002112601.9981-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t] igt/kms_busy: Flush request queue when re-enabling hangcheck X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: igt-dev@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Enabling hangcheck only takes effect at the start of a new request queue. Before we re-enable hangcheck after our poking around, we therefore need to wait until the gpu is idle otherwise the next test will start without hangcheck and subsequently hang forever. Signed-off-by: Chris Wilson Cc: Petri Latvala Tested-by: Petri Latvala Reviewed-by: Petri Latvala --- tests/kms_busy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/kms_busy.c b/tests/kms_busy.c index d821ec711..ed3caae4c 100644 --- a/tests/kms_busy.c +++ b/tests/kms_busy.c @@ -138,6 +138,7 @@ static void flip_to_fb(igt_display_t *dpy, int pipe, igt_assert(poll(&pfd, 1, 0) == 0); if (modeset) { + gem_quiescent_gpu(dpy->drm_fd); igt_set_module_param_int("enable_hangcheck", 1); /* Clear old mode blob. */