From patchwork Mon Jun 26 07:22:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Kocialkowki X-Patchwork-Id: 9808729 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 A1B106020A for ; Mon, 26 Jun 2017 07:23:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B58CB2684F for ; Mon, 26 Jun 2017 07:23:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A9DB127F98; Mon, 26 Jun 2017 07:23:05 +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 1E11D2684F for ; Mon, 26 Jun 2017 07:23:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B6A0189A7A; Mon, 26 Jun 2017 07:23:04 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id C1E3589A7A for ; Mon, 26 Jun 2017 07:23:02 +0000 (UTC) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jun 2017 00:23:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,394,1493708400"; d="scan'208";a="101495273" Received: from linux.intel.com ([10.54.29.200]) by orsmga004.jf.intel.com with ESMTP; 26 Jun 2017 00:22:35 -0700 Received: from workstation.fi.intel.com (workstation.fi.intel.com [10.237.68.144]) by linux.intel.com (Postfix) with ESMTP id 1395E58059A; Mon, 26 Jun 2017 00:22:33 -0700 (PDT) From: Paul Kocialkowski To: intel-gfx@lists.freedesktop.org Date: Mon, 26 Jun 2017 10:22:17 +0300 Message-Id: <20170626072219.2470-3-paul.kocialkowski@linux.intel.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170626072219.2470-1-paul.kocialkowski@linux.intel.com> References: <20170626072219.2470-1-paul.kocialkowski@linux.intel.com> Cc: Lyude Subject: [Intel-gfx] [PATCH i-g-t 3/5] lib/igt_chamelium: Get rid of async hpd pulse functions 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 removes the functions related to async hpd pulse handling, that were used for hpd toggle during suspend testing. Since the XMLRPC library does not guarantee that the call will be made before caring for its result, this function did not work properly. These functions are deprecated in favor of HPD toggle scheduling, that was recently added to the Chamelium's XMLRPC API and IGT. Signed-off-by: Paul Kocialkowski --- lib/igt_chamelium.c | 72 ----------------------------------------------------- lib/igt_chamelium.h | 4 --- 2 files changed, 76 deletions(-) diff --git a/lib/igt_chamelium.c b/lib/igt_chamelium.c index 523cc853..225f98c3 100644 --- a/lib/igt_chamelium.c +++ b/lib/igt_chamelium.c @@ -469,78 +469,6 @@ void chamelium_schedule_hpd_toggle(struct chamelium *chamelium, "(iii)", port->id, delay_ms, rising_edge)); } -static void async_rpc_handler(const char *server_url, const char *method_name, - xmlrpc_value *param_array, void *user_data, - xmlrpc_env *fault, xmlrpc_value *result) -{ - /* We don't care about the responses */ -} - -/** - * chamelium_async_hpd_pulse_start: - * @chamelium: The Chamelium instance to use - * @port: The port to fire the HPD pulses on - * @high: Whether to fire a high pulse (e.g. simulate a connect), or a low - * pulse (e.g. simulate a disconnect) - * @delay_secs: How long to wait before sending the HPD pulse. - * - * Instructs the chamelium to send an hpd pulse after @delay_secs seconds have - * passed, without waiting for the chamelium to finish. This is useful for - * testing things such as hpd after a suspend/resume cycle, since we can't tell - * the chamelium to send a hotplug at the same time that our system is - * suspended. - * - * It is required that the user eventually call - * #chamelium_async_hpd_pulse_finish, to clean up the leftover XML-RPC - * responses from the chamelium. - */ -void chamelium_async_hpd_pulse_start(struct chamelium *chamelium, - struct chamelium_port *port, - bool high, int delay_secs) -{ - xmlrpc_value *pulse_widths = xmlrpc_array_new(&chamelium->env), *width; - - /* TODO: Actually implement something in the chameleon server to allow - * for delayed actions such as hotplugs. This would work a bit better - * and allow us to test suspend/resume on ports without hpd like VGA - */ - - igt_debug("Sending HPD pulse (%s) on %s with %d second delay\n", - high ? "high->low" : "low->high", port->name, delay_secs); - - /* If we're starting at high, make the first pulse width 0 so we keep - * the port connected */ - if (high) { - width = xmlrpc_int_new(&chamelium->env, 0); - xmlrpc_array_append_item(&chamelium->env, pulse_widths, width); - xmlrpc_DECREF(width); - } - - width = xmlrpc_int_new(&chamelium->env, delay_secs * 1000); - xmlrpc_array_append_item(&chamelium->env, pulse_widths, width); - xmlrpc_DECREF(width); - - xmlrpc_client_start_rpcf(&chamelium->env, chamelium->client, - chamelium->url, - "FireMixedHpdPulses", async_rpc_handler, NULL, - "(iA)", port->id, pulse_widths); - xmlrpc_DECREF(pulse_widths); -} - -/** - * chamelium_async_hpd_pulse_finish: - * @chamelium: The Chamelium instance to use - * - * Waits for any asynchronous RPC started by #chamelium_async_hpd_pulse_start - * to complete, and then cleans up any leftover responses from the chamelium. - * If all of the RPC calls have already completed, this function returns - * immediately. - */ -void chamelium_async_hpd_pulse_finish(struct chamelium *chamelium) -{ - xmlrpc_client_event_loop_finish(chamelium->client); -} - /** * chamelium_new_edid: * @chamelium: The Chamelium instance to use diff --git a/lib/igt_chamelium.h b/lib/igt_chamelium.h index 408a4b85..81322ad2 100644 --- a/lib/igt_chamelium.h +++ b/lib/igt_chamelium.h @@ -64,10 +64,6 @@ void chamelium_fire_hpd_pulses(struct chamelium *chamelium, void chamelium_schedule_hpd_toggle(struct chamelium *chamelium, struct chamelium_port *port, int delay_ms, bool rising_edge); -void chamelium_async_hpd_pulse_start(struct chamelium *chamelium, - struct chamelium_port *port, - bool high, int delay_secs); -void chamelium_async_hpd_pulse_finish(struct chamelium *chamelium); int chamelium_new_edid(struct chamelium *chamelium, const unsigned char *edid); void chamelium_port_set_edid(struct chamelium *chamelium, struct chamelium_port *port, int edid_id);