This adds support for reading a SuspendResumeDelay property (under [DUT]) in the IGT configuration (igtrc) and exposing it through a chamelium_get_suspend_resume_delay function. Signed-off-by: Paul Kocialkowski <paul.kocialkowski@xxxxxxxxxxxxxxx> --- lib/igt_chamelium.c | 31 ++++++++++++++++++++++++++++++- lib/igt_chamelium.h | 1 + 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/lib/igt_chamelium.c b/lib/igt_chamelium.c index 225f98c3..a1aaf405 100644 --- a/lib/igt_chamelium.c +++ b/lib/igt_chamelium.c @@ -58,7 +58,7 @@ * [Chamelium] * URL=http://chameleon:9992 # The URL used for connecting to the Chamelium's RPC server * - * # The rest of the sections are used for defining connector mappings. + * # The following sections are used for defining connector mappings. * # This is required so any tests using the Chamelium know which connector * # on the test machine should be connected to each Chamelium port. * # @@ -70,12 +70,19 @@ * * [Chamelium:HDMI-A-1] * ChameliumPortID=3 + * + * # The following section is used for configuring the Device Under Test. + * # It is not mandatory and allows overriding default values. + * [DUT] + * SuspendResumeDelay=10 * ]| * * By default, this file is expected to exist in ~/.igtrc . The directory for * this can be overriden by setting the environment variable %IGT_CONFIG_PATH. */ +#define SUSPEND_RESUME_DELAY_DEFAULT 20 /* seconds */ + struct chamelium_edid { int id; struct igt_list link; @@ -100,6 +107,7 @@ struct chamelium { xmlrpc_env env; xmlrpc_client *client; char *url; + int suspend_resume_delay; /* Indicates the last port to have been used for capturing video */ struct chamelium_port *capturing_port; @@ -114,6 +122,20 @@ struct chamelium { static struct chamelium *cleanup_instance; /** + * chamelium_get_suspend_resume_delay: + * @chamelium: The Chamelium instance to use + * + * Retrieves the suspend/resume delay as specified in the configuration or + * its default value. + * + * Returns: the suspend/resume delay in seconds + */ +int chamelium_get_suspend_resume_delay(struct chamelium *chamelium) +{ + return chamelium->suspend_resume_delay; +} + +/** * chamelium_get_ports: * @chamelium: The Chamelium instance to use * @count: Where to store the number of ports @@ -1157,6 +1179,13 @@ static bool chamelium_read_config(struct chamelium *chamelium, int drm_fd) goto out; } + rc = g_key_file_get_integer(key_file, "DUT", "SuspendResumeDelay", + &error); + if (rc == 0) + chamelium->suspend_resume_delay = SUSPEND_RESUME_DELAY_DEFAULT; + else + chamelium->suspend_resume_delay = rc; + ret = chamelium_read_port_mappings(chamelium, drm_fd, key_file); out: diff --git a/lib/igt_chamelium.h b/lib/igt_chamelium.h index 81322ad2..380f9b36 100644 --- a/lib/igt_chamelium.h +++ b/lib/igt_chamelium.h @@ -41,6 +41,7 @@ struct chamelium *chamelium_init(int drm_fd); void chamelium_deinit(struct chamelium *chamelium); void chamelium_reset(struct chamelium *chamelium); +int chamelium_get_suspend_resume_delay(struct chamelium *chamelium); struct chamelium_port **chamelium_get_ports(struct chamelium *chamelium, int *count); unsigned int chamelium_port_get_type(const struct chamelium_port *port); -- 2.13.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
