From patchwork Mon Jun 26 13:59:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Kocialkowki X-Patchwork-Id: 9809755 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 7C407603D7 for ; Mon, 26 Jun 2017 14:00:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E1C3285EE for ; Mon, 26 Jun 2017 14:00:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6FD9B285DC; Mon, 26 Jun 2017 14:00:51 +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 812EB285C7 for ; Mon, 26 Jun 2017 14:00:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CED5E6E257; Mon, 26 Jun 2017 14:00:49 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8CD056E257 for ; Mon, 26 Jun 2017 14:00:48 +0000 (UTC) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jun 2017 07:00:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,395,1493708400"; d="scan'208";a="101581713" Received: from linux.intel.com ([10.54.29.200]) by orsmga004.jf.intel.com with ESMTP; 26 Jun 2017 07:00:17 -0700 Received: from workstation.fi.intel.com (workstation.fi.intel.com [10.237.68.144]) by linux.intel.com (Postfix) with ESMTP id 26AB0580351; Mon, 26 Jun 2017 07:00:15 -0700 (PDT) From: Paul Kocialkowski To: intel-gfx@lists.freedesktop.org Date: Mon, 26 Jun 2017 16:59:00 +0300 Message-Id: <20170626135906.32708-1-paul.kocialkowski@linux.intel.com> X-Mailer: git-send-email 2.13.1 Cc: Lyude Subject: [Intel-gfx] [PATCH i-g-t 1/7] tests/chamelium: Update connector state without reprobe when possible X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This renames the reprobe_connector function to update_connector and ensures that full reprobe of the connector is only done when really necessary (e.g. when changing the EDID). A full reprobe takes time and is not required for updating the connector state. Thus, this allows executing tests faster. Signed-off-by: Paul Kocialkowski --- tests/chamelium.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/tests/chamelium.c b/tests/chamelium.c index b7eaa2fa..e1f21fb8 100644 --- a/tests/chamelium.c +++ b/tests/chamelium.c @@ -100,13 +100,14 @@ require_connector_present(data_t *data, unsigned int type) } static drmModeConnection -reprobe_connector(data_t *data, struct chamelium_port *port) +update_connector(data_t *data, struct chamelium_port *port, bool reprobe) { drmModeConnector *connector; drmModeConnection status; - igt_debug("Reprobing %s...\n", chamelium_port_get_name(port)); - connector = chamelium_port_get_connector(data->chamelium, port, true); + igt_debug("Updating %s...\n", chamelium_port_get_name(port)); + connector = chamelium_port_get_connector(data->chamelium, port, + reprobe); igt_assert(connector); status = connector->connection; @@ -116,7 +117,7 @@ reprobe_connector(data_t *data, struct chamelium_port *port) static void wait_for_connector(data_t *data, struct chamelium_port *port, - drmModeConnection status) + drmModeConnection status, bool reprobe) { bool finished = false; @@ -129,7 +130,7 @@ wait_for_connector(data_t *data, struct chamelium_port *port, * that hpd events work in the event that hpd doesn't work on the system */ igt_until_timeout(HOTPLUG_TIMEOUT) { - if (reprobe_connector(data, port) == status) { + if (update_connector(data, port, reprobe) == status) { finished = true; return; } @@ -148,11 +149,12 @@ reset_state(data_t *data, struct chamelium_port *port) chamelium_reset(data->chamelium); if (port) { - wait_for_connector(data, port, DRM_MODE_DISCONNECTED); + wait_for_connector(data, port, DRM_MODE_DISCONNECTED, false); } else { for (p = 0; p < data->port_count; p++) { port = data->ports[p]; - wait_for_connector(data, port, DRM_MODE_DISCONNECTED); + wait_for_connector(data, port, DRM_MODE_DISCONNECTED, + false); } } } @@ -172,7 +174,7 @@ test_basic_hotplug(data_t *data, struct chamelium_port *port) /* Check if we get a sysfs hotplug event */ chamelium_plug(data->chamelium, port); igt_assert(igt_hotplug_detected(mon, HOTPLUG_TIMEOUT)); - igt_assert_eq(reprobe_connector(data, port), + igt_assert_eq(update_connector(data, port, false), DRM_MODE_CONNECTED); igt_flush_hotplugs(mon); @@ -180,7 +182,7 @@ test_basic_hotplug(data_t *data, struct chamelium_port *port) /* Now check if we get a hotplug from disconnection */ chamelium_unplug(data->chamelium, port); igt_assert(igt_hotplug_detected(mon, HOTPLUG_TIMEOUT)); - igt_assert_eq(reprobe_connector(data, port), + igt_assert_eq(update_connector(data, port, false), DRM_MODE_DISCONNECTED); } @@ -201,7 +203,7 @@ test_edid_read(data_t *data, struct chamelium_port *port, chamelium_port_set_edid(data->chamelium, port, edid_id); chamelium_plug(data->chamelium, port); - wait_for_connector(data, port, DRM_MODE_CONNECTED); + wait_for_connector(data, port, DRM_MODE_CONNECTED, true); igt_assert(kmstest_get_property(data->drm_fd, connector->connector_id, DRM_MODE_OBJECT_CONNECTOR, "EDID", NULL, @@ -244,13 +246,13 @@ try_suspend_resume_hpd(data_t *data, struct chamelium_port *port, igt_assert(igt_hotplug_detected(mon, HOTPLUG_TIMEOUT)); if (port) { - igt_assert_eq(reprobe_connector(data, port), connected ? + igt_assert_eq(update_connector(data, port, false), connected ? DRM_MODE_DISCONNECTED : DRM_MODE_CONNECTED); } else { for (p = 0; p < data->port_count; p++) { port = data->ports[p]; - igt_assert_eq(reprobe_connector(data, port), connected ? - DRM_MODE_DISCONNECTED : + igt_assert_eq(update_connector(data, port, false), + connected ? DRM_MODE_DISCONNECTED : DRM_MODE_CONNECTED); } @@ -314,7 +316,7 @@ test_suspend_resume_edid_change(data_t *data, struct chamelium_port *port, /* First plug in the port */ chamelium_port_set_edid(data->chamelium, port, edid_id); chamelium_plug(data->chamelium, port); - wait_for_connector(data, port, DRM_MODE_CONNECTED); + wait_for_connector(data, port, DRM_MODE_CONNECTED, true); igt_flush_hotplugs(mon); @@ -349,7 +351,7 @@ prepare_output(data_t *data, chamelium_port_set_edid(data->chamelium, port, data->edid_id); chamelium_plug(data->chamelium, port); - wait_for_connector(data, port, DRM_MODE_CONNECTED); + wait_for_connector(data, port, DRM_MODE_CONNECTED, true); igt_display_init(display, data->drm_fd); output = igt_output_from_connector(display, connector); @@ -587,7 +589,7 @@ test_hpd_without_ddc(data_t *data, struct chamelium_port *port) chamelium_plug(data->chamelium, port); igt_assert(igt_hotplug_detected(mon, HOTPLUG_TIMEOUT)); - igt_assert_eq(reprobe_connector(data, port), DRM_MODE_CONNECTED); + igt_assert_eq(update_connector(data, port, false), DRM_MODE_CONNECTED); igt_cleanup_hotplug(mon); }