From patchwork Thu Aug 16 14:17:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 10567569 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 8742D913 for ; Thu, 16 Aug 2018 14:17:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76FB02B0EB for ; Thu, 16 Aug 2018 14:17:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A71D2B0F7; Thu, 16 Aug 2018 14:17:45 +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 1F6F42B0EB for ; Thu, 16 Aug 2018 14:17:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5A3836E1FB; Thu, 16 Aug 2018 14:17:44 +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 F38296E1FB; Thu, 16 Aug 2018 14:17:42 +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 12954627-1500050 for multiple; Thu, 16 Aug 2018 15:17:30 +0100 From: Chris Wilson To: igt-dev@lists.freedesktop.org Date: Thu, 16 Aug 2018 15:17:26 +0100 Message-Id: <20180816141726.14791-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.18.0 Subject: [Intel-gfx] [PATCH i-g-t] igt/pm_rpm: Skip counting modes if modprobed with disable_display 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 If we've explicitly disabled the display, we will never find any connected outputs or modes. Checking for them will fail and report the missing requirement instead. Signed-off-by: Chris Wilson Cc: Imre Deak --- tests/pm_rpm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c index fefcb1beb..2c4bf529c 100644 --- a/tests/pm_rpm.c +++ b/tests/pm_rpm.c @@ -2046,7 +2046,6 @@ int main(int argc, char *argv[]) igt_assert(setup_environment()); basic_subtest(); - drm_resources_equal_subtest(); pci_d3_state_subtest(); teardown_environment(); @@ -2056,7 +2055,8 @@ int main(int argc, char *argv[]) igt_assert(setup_environment()); basic_subtest(); - drm_resources_equal_subtest(); + if (enable_one_screen_with_type(data, SCREEN_TYPE_ANY)) + drm_resources_equal_subtest(); pci_d3_state_subtest(); teardown_environment(); }