From patchwork Wed Dec 21 16:21:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bugzilla-daemon@freedesktop.org X-Patchwork-Id: 9483241 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5921B6022E for ; Wed, 21 Dec 2016 16:21:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4AA4428473 for ; Wed, 21 Dec 2016 16:21:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F7ED28479; Wed, 21 Dec 2016 16:21:10 +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=-4.2 required=2.0 tests=BAYES_00,HTML_MESSAGE, 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 D672D28473 for ; Wed, 21 Dec 2016 16:21:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 728D06F087; Wed, 21 Dec 2016 16:21:08 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from culpepper.freedesktop.org (culpepper.freedesktop.org [IPv6:2610:10:20:722:a800:ff:fe98:4b55]) by gabe.freedesktop.org (Postfix) with ESMTP id 4D0436F087 for ; Wed, 21 Dec 2016 16:21:06 +0000 (UTC) Received: by culpepper.freedesktop.org (Postfix, from userid 33) id 4B48772171; Wed, 21 Dec 2016 16:21:06 +0000 (UTC) From: bugzilla-daemon@freedesktop.org To: dri-devel@lists.freedesktop.org Subject: [Bug 99130] [IVB] CONFIG_PROVE_LOCKING=y causes igt/gem_exec/basic-wait-all (and possibly others) to fail Date: Wed, 21 Dec 2016 16:21:06 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: DRI X-Bugzilla-Component: IGT X-Bugzilla-Version: unspecified X-Bugzilla-Keywords: X-Bugzilla-Severity: normal X-Bugzilla-Who: chris@chris-wilson.co.uk X-Bugzilla-Status: NEW X-Bugzilla-Resolution: X-Bugzilla-Priority: medium X-Bugzilla-Assigned-To: dri-devel@lists.freedesktop.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: X-Bugzilla-URL: http://bugs.freedesktop.org/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP https://bugs.freedesktop.org/show_bug.cgi?id=99130 --- Comment #17 from Chris Wilson --- Try: diff --git a/lib/igt_core.c b/lib/igt_core.c index a18a728c..403b9423 100644 --- a/lib/igt_core.c +++ b/lib/igt_core.c @@ -67,6 +67,7 @@ #include "igt_core.h" #include "igt_aux.h" +#include "igt_sysfs.h" #ifdef HAVE_LIBGEN_H #include /* for basename() on Solaris */ @@ -512,6 +513,7 @@ static void common_exit_handler(int sig) { if (!igt_only_list_subtests()) { low_mem_killer_disable(false); + kick_fbcon(true); } /* When not killed by a signal check that igt_exit() has been properly @@ -731,6 +733,7 @@ out: exit(ret == -1 ? 0 : IGT_EXIT_INVALID); if (!list_subtests) { + kick_fbcon(false); kmsg(KERN_INFO "[IGT] %s: executing\n", command_str); print_version();