From patchwork Wed Aug 15 20:59:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 10566849 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 BFFF5921 for ; Wed, 15 Aug 2018 20:59:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 701C12AB77 for ; Wed, 15 Aug 2018 20:59:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6370C2ABA7; Wed, 15 Aug 2018 20:59:37 +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 C0DA52AB77 for ; Wed, 15 Aug 2018 20:59:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9313E6E415; Wed, 15 Aug 2018 20:59:35 +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 EF61C6E415; Wed, 15 Aug 2018 20:59:33 +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 12935349-1500050 for multiple; Wed, 15 Aug 2018 21:59:28 +0100 From: Chris Wilson To: igt-dev@lists.freedesktop.org Date: Wed, 15 Aug 2018 21:59:24 +0100 Message-Id: <20180815205924.6949-2-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180815205924.6949-1-chris@chris-wilson.co.uk> References: <20180815205924.6949-1-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [PATCH i-g-t 2/2] igt/pm_rpm: Avoid at_exit_drm_fd 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: intel-gfx@lists.freedesktop.org MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Keep the drm_fd owned by pm_rpm as we need to relinquish all ownership of the device in order to unload the module. Signed-off-by: Chris Wilson Reviewed-by: Antonio Argenziano --- tests/pm_rpm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c index c0212ed70..f0781617c 100644 --- a/tests/pm_rpm.c +++ b/tests/pm_rpm.c @@ -697,7 +697,10 @@ static bool setup_environment(void) if (has_runtime_pm) goto out; - drm_fd = drm_open_driver_master(DRIVER_INTEL); + drm_fd = __drm_open_driver(DRIVER_INTEL); + igt_require(drm_fd != -1); + igt_device_set_master(drm_fd); + debugfs = igt_debugfs_dir(drm_fd); igt_require(debugfs != -1);