From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3735A10E258 for ; Mon, 23 Oct 2023 20:59:18 +0000 (UTC) Received: by mail-qk1-x72f.google.com with SMTP id af79cd13be357-7789a4c01ddso256953285a.1 for ; Mon, 23 Oct 2023 13:59:18 -0700 (PDT) From: Sean Paul To: igt-dev@lists.freedesktop.org Date: Mon, 23 Oct 2023 20:56:33 +0000 Message-ID: <20231023205910.3556533-4-sean@poorly.run> In-Reply-To: <20231023205910.3556533-1-sean@poorly.run> References: <20231023205910.3556533-1-sean@poorly.run> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH v2 3/8] tests/kms_vrr: Allow test rate to be altered from the command line List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sean Paul Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: From: Sean Paul Instead of always using the midpoint, introduce optional argument --refresh-rate to allow callers to specify the target refresh rate for the test. Cc: Mark Yacoub Reviewed-by: Bhanuprakash Modem Signed-off-by: Sean Paul Changes in v2: - Add short opt to the main callsite (Bhanu) --- tests/kms_vrr.c | 44 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/tests/kms_vrr.c b/tests/kms_vrr.c index 36f5b100d..62335e9bf 100644 --- a/tests/kms_vrr.c +++ b/tests/kms_vrr.c @@ -98,7 +98,7 @@ typedef struct range { typedef struct vtest_ns { uint64_t min; - uint64_t mid; + uint64_t rate_ns; uint64_t max; } vtest_ns_t; @@ -245,10 +245,18 @@ static void prepare_test(data_t *data, igt_output_t *output, enum pipe pipe) data->range = get_vrr_range(data, output); data->vtest_ns.min = rate_from_refresh(data->range.min); - data->vtest_ns.mid = rate_from_refresh( - (data->range.min + data->range.max) / 2); data->vtest_ns.max = rate_from_refresh(data->range.max); + /* If unspecified on the command line, default rate to the midpoint */ + if (data->vtest_ns.rate_ns == 0) { + range_t *range = &data->range; + data->vtest_ns.rate_ns = rate_from_refresh( + (range->min + range->max) / 2); + } + igt_assert_f(data->vtest_ns.rate_ns <= data->vtest_ns.min && + data->vtest_ns.rate_ns >= data->vtest_ns.max, + "Invalid test rate specified!\n"); + /* Override mode with max vrefresh. * - vrr_min range should be less than the override mode vrefresh. * - Limit the vrr_max range with the override mode vrefresh. @@ -401,7 +409,7 @@ test_basic(data_t *data, enum pipe pipe, igt_output_t *output, uint32_t flags) prepare_test(data, output, pipe); range = data->range; vtest_ns = data->vtest_ns; - rate = vtest_ns.mid; + rate = vtest_ns.rate_ns; igt_info("VRR Test execution on %s, PIPE_%s with VRR range: (%u-%u) Hz\n", output->name, kmstest_pipe_name(pipe), range.min, range.max); @@ -452,7 +460,7 @@ test_basic(data_t *data, enum pipe pipe, igt_output_t *output, uint32_t flags) } if (flags & ~TEST_NEGATIVE) { - rate = vtest_ns.mid; + rate = vtest_ns.rate_ns; result = flip_and_measure(data, output, pipe, rate, TEST_DURATION_NS); igt_assert_f(result > 75, "Refresh rate (%u Hz) %"PRIu64"ns: Target VRR on threshold not reached, result was %u%%\n", @@ -473,7 +481,7 @@ test_basic(data_t *data, enum pipe pipe, igt_output_t *output, uint32_t flags) * a VRR capable panel. */ set_vrr_on_pipe(data, pipe, (flags & TEST_NEGATIVE)? true : false); - rate = vtest_ns.mid; + rate = vtest_ns.rate_ns; result = flip_and_measure(data, output, pipe, rate, TEST_DURATION_NS); igt_assert_f(result < 10, "Refresh rate (%u Hz) %"PRIu64"ns: Target VRR %s threshold exceeded, result was %u%%\n", @@ -525,10 +533,30 @@ run_vrr_test(data_t *data, test_t test, uint32_t flags) } } -igt_main +static int opt_handler(int opt, int opt_index, void *_data) { - data_t data = {}; + data_t *data = _data; + + switch (opt) { + case 'r': + data->vtest_ns.rate_ns = rate_from_refresh(atoi(optarg)); + break; + } + return IGT_OPT_HANDLER_SUCCESS; +} +static const struct option long_opts[] = { + { .name = "refresh-rate", .has_arg = true, .val = 'r', }, + {} +}; + +static const char help_str[] = + " --refresh-rate \t\tThe refresh rate to flip at\n"; + +static data_t data; + +igt_main_args("r:", long_opts, help_str, opt_handler, &data) +{ igt_fixture { data.drm_fd = drm_open_driver_master(DRIVER_ANY); -- Sean Paul, Software Engineer, Google / Chromium OS