From patchwork Thu Apr 5 18:47:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 10325169 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 0346C6032A for ; Thu, 5 Apr 2018 18:48:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D72F729194 for ; Thu, 5 Apr 2018 18:48:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CB3E629199; Thu, 5 Apr 2018 18:48:15 +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, 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 4F35629194 for ; Thu, 5 Apr 2018 18:48:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 881636E054; Thu, 5 Apr 2018 18:48:13 +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 018636E010; Thu, 5 Apr 2018 18:48:11 +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 11275905-1500050 for multiple; Thu, 05 Apr 2018 19:48:00 +0100 Received: by haswell.alporthouse.com (sSMTP sendmail emulation); Thu, 05 Apr 2018 19:48:00 +0100 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Thu, 5 Apr 2018 19:47:57 +0100 Message-Id: <20180405184757.15907-2-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180405184757.15907-1-chris@chris-wilson.co.uk> References: <20180405184757.15907-1-chris@chris-wilson.co.uk> X-Originating-IP: 78.156.65.138 X-Country: code=GB country="United Kingdom" ip=78.156.65.138 Subject: [Intel-gfx] [PATCH igt 2/2] igt/gem_eio: Drop DRM_MASTER so we can reacquire it in the subtests 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 MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP As we reopen the fd for each subtest, and we need a DRM_MASTER, we need to drop master on the original before we are allowed to claim DRM_MASTER on the second. Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Reviewed-by: Tvrtko Ursulin --- tests/gem_eio.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/gem_eio.c b/tests/gem_eio.c index 9599e73d..66d8c18a 100644 --- a/tests/gem_eio.c +++ b/tests/gem_eio.c @@ -41,6 +41,7 @@ #include #include "igt.h" +#include "igt_device.h" #include "igt_sysfs.h" #include "sw_sync.h" @@ -674,6 +675,7 @@ igt_main igt_fixture { fd = drm_open_driver(DRIVER_INTEL); + igt_device_drop_master(fd); igt_require(i915_reset_control(true)); igt_force_gpu_reset(fd);