Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [i-g-t V4 6/7] tests/kms_vrr: Add new subtest to switch RR without modeset
Date: Fri,  1 Dec 2023 19:47:02 +0530	[thread overview]
Message-ID: <20231201141703.3013801-7-bhanuprakash.modem@intel.com> (raw)
In-Reply-To: <20231201141703.3013801-1-bhanuprakash.modem@intel.com>

Add new subtest to switch between low refresh rate to high
refresh rate and vice versa seamlessly without modeset.

Below are the sequence of operations to perform:

1. Use High RR mode + VRR On (if panel supports) -> Measure vblank timings
2. Switch to Low RR mode -> Measure vblank timings
3. Switch back to High RR mode -> Measure vblank timings

Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
 tests/kms_vrr.c | 135 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 124 insertions(+), 11 deletions(-)

diff --git a/tests/kms_vrr.c b/tests/kms_vrr.c
index 422d89073..8b89d1a87 100644
--- a/tests/kms_vrr.c
+++ b/tests/kms_vrr.c
@@ -53,6 +53,10 @@
  * SUBTEST: flipline
  * Description: Make sure that flips happen at flipline decision boundary.
  *
+ * SUBTEST: seamless-rr-switch
+ * Description: Test to switch RR seamlessly without modeset.
+ * Functionality: adaptive_sync, drrs, lrr
+ *
  * SUBTEST: negative-basic
  * Description: Make sure that VRR should not be enabled on the Non-VRR panel.
  */
@@ -70,7 +74,14 @@ enum {
 	TEST_DPMS = 1 << 1,
 	TEST_SUSPEND = 1 << 2,
 	TEST_FLIPLINE = 1 << 3,
-	TEST_NEGATIVE = 1 << 4,
+	TEST_SEAMLESS_RR = 1 << 4,
+	TEST_NEGATIVE = 1 << 5,
+};
+
+enum {
+	HIGH_RR_MODE,
+	LOW_RR_MODE,
+	RR_MODES_COUNT,
 };
 
 typedef struct range {
@@ -85,6 +96,7 @@ typedef struct data {
 	igt_fb_t fb0;
 	igt_fb_t fb1;
 	range_t range;
+	drmModeModeInfo switch_modes[RR_MODES_COUNT];
 } data_t;
 
 typedef struct vtest_ns {
@@ -166,6 +178,24 @@ output_mode_with_maxrate(igt_output_t *output, unsigned int vrr_max)
 	return mode;
 }
 
+static drmModeModeInfo
+low_rr_mode_with_same_res(igt_output_t *output, unsigned int vrr_min)
+{
+	int i;
+	drmModeConnectorPtr connector = output->config.connector;
+	drmModeModeInfo mode = *igt_output_get_mode(output);
+
+	for (i = 0; i < connector->count_modes; i++)
+		/* TODO: Improve checks for downclock */
+		if (connector->modes[i].hdisplay == mode.hdisplay &&
+		    connector->modes[i].vdisplay == mode.vdisplay &&
+		    connector->modes[i].vrefresh < mode.vrefresh &&
+		    connector->modes[i].vrefresh >= vrr_min)
+			mode = connector->modes[i];
+
+	return mode;
+}
+
 /* Read min and max vrr range from the connector debugfs. */
 static range_t
 get_vrr_range(data_t *data, igt_output_t *output)
@@ -380,6 +410,9 @@ test_basic(data_t *data, enum pipe pipe, igt_output_t *output, uint32_t flags)
 	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);
 
+	igt_info("Override Mode: ");
+	kmstest_dump_mode(&data->switch_modes[HIGH_RR_MODE]);
+
 	set_vrr_on_pipe(data, pipe, true);
 
 	/*
@@ -456,7 +489,9 @@ test_basic(data_t *data, enum pipe pipe, igt_output_t *output, uint32_t flags)
 
 static void test_cleanup(data_t *data, enum pipe pipe, igt_output_t *output)
 {
-	igt_pipe_set_prop_value(&data->display, pipe, IGT_CRTC_VRR_ENABLED, false);
+	if (vrr_capable(output))
+		igt_pipe_set_prop_value(&data->display, pipe, IGT_CRTC_VRR_ENABLED, false);
+
 	igt_plane_set_fb(data->primary, NULL);
 	igt_output_set_pipe(output, PIPE_NONE);
 	igt_output_override_mode(output, NULL);
@@ -466,9 +501,71 @@ static void test_cleanup(data_t *data, enum pipe pipe, igt_output_t *output)
 	igt_remove_fb(data->drm_fd, &data->fb0);
 }
 
-static bool output_constraint(data_t *data, igt_output_t *output)
+static void
+test_seamless_rr_basic(data_t *data, enum pipe pipe, igt_output_t *output, uint32_t flags)
 {
-	drmModeModeInfo mode;
+	uint32_t result;
+	vtest_ns_t vtest_ns;
+	uint64_t rate;
+	bool vrr = vrr_capable(output);
+
+	igt_info("Use HIGH_RR Mode as default (VRR: %s): ", vrr ? "ON" : "OFF");
+	kmstest_dump_mode(&data->switch_modes[HIGH_RR_MODE]);
+
+	prepare_test(data, output, pipe);
+	vtest_ns = get_test_rate_ns(data->range);
+
+	if (vrr) {
+		igt_pipe_set_prop_value(&data->display, pipe, IGT_CRTC_VRR_ENABLED, true);
+		igt_assert(igt_display_try_commit_atomic(&data->display, 0, NULL) == 0);
+	}
+
+	rate = vtest_ns.max;
+	result = flip_and_measure(data, output, pipe, rate, TEST_DURATION_NS);
+	igt_assert_f(result > 75,
+		     "Refresh rate (%u Hz) %"PRIu64"ns: Target VRR %s threshold not reached, result was %u%%\n",
+		     data->range.max, rate, vrr ? "on" : "off", result);
+
+	/* Switch to low rr mode without modeset. */
+	igt_info("Switch to LOW_RR Mode (VRR: %s): ", vrr ? "ON" : "OFF");
+	kmstest_dump_mode(&data->switch_modes[LOW_RR_MODE]);
+	igt_output_override_mode(output, &data->switch_modes[LOW_RR_MODE]);
+	igt_assert(igt_display_try_commit_atomic(&data->display, 0, NULL) == 0);
+
+	rate = vtest_ns.min;
+	result = flip_and_measure(data, output, pipe, rate, TEST_DURATION_NS);
+	igt_assert_f(result > 75,
+		     "Refresh rate (%u Hz) %"PRIu64"ns: Target VRR %s threshold not reached, result was %u%%\n",
+		     data->range.min, rate, vrr ? "on" : "off", result);
+
+	/* Switch back to high rr mode without modeset. */
+	igt_info("Switch back to HIGH_RR Mode (VRR: %s): ", vrr ? "ON" : "OFF");
+	kmstest_dump_mode(&data->switch_modes[HIGH_RR_MODE]);
+	igt_output_override_mode(output, &data->switch_modes[HIGH_RR_MODE]);
+	igt_assert(igt_display_try_commit_atomic(&data->display, 0, NULL) == 0);
+
+	rate = vtest_ns.mid;
+	result = flip_and_measure(data, output, pipe, rate, TEST_DURATION_NS);
+	igt_assert_f(vrr ? (result > 75) : (result < 10),
+		     "Refresh rate (%u Hz) %"PRIu64"ns: Target VRR %s threshold %s, result was %u%%\n",
+		     ((data->range.max + data->range.min) / 2), rate,
+		     vrr ? "on" : "off", vrr ? "not reached" : "exceeded", result);
+}
+
+static bool output_constraint(data_t *data, igt_output_t *output, uint32_t flags)
+{
+	if ((flags & TEST_SEAMLESS_RR) &&
+	    output->config.connector->connector_type != DRM_MODE_CONNECTOR_eDP)
+		return false;
+
+	/*
+	 * FIXME: Read the DRRS capability, currently assuming:
+	 * - Panel should contain 2 modes only
+	 * - Both modes should have the same resolution but different RR
+	 */
+	if ((flags & TEST_SEAMLESS_RR) &&
+	    !vrr_capable(output) && output->config.connector->count_modes != 2)
+		return false;
 
 	/* Reset output */
 	igt_display_reset(&data->display);
@@ -481,16 +578,22 @@ static bool output_constraint(data_t *data, igt_output_t *output)
 	 *   - vrr_min range should be less than the override mode vrefresh.
 	 *   - Limit the vrr_max range with the override mode vrefresh.
 	 */
-	mode = output_mode_with_maxrate(output, data->range.max);
-	if (mode.vrefresh < data->range.min)
+	data->switch_modes[HIGH_RR_MODE] = output_mode_with_maxrate(output, data->range.max);
+	if (data->switch_modes[HIGH_RR_MODE].vrefresh < data->range.min)
 		return false;
 
-	data->range.max = mode.vrefresh;
+	data->range.max = data->switch_modes[HIGH_RR_MODE].vrefresh;
+	igt_output_override_mode(output, &data->switch_modes[HIGH_RR_MODE]);
 
-	igt_info("Override Mode: ");
-	kmstest_dump_mode(&mode);
+	/* Search for a low refresh rate mode. */
+	if (!(flags & TEST_SEAMLESS_RR))
+		return true;
+
+	data->switch_modes[LOW_RR_MODE] = low_rr_mode_with_same_res(output, data->range.min);
+	if (data->switch_modes[LOW_RR_MODE].vrefresh == data->switch_modes[HIGH_RR_MODE].vrefresh)
+		return false;
 
-	igt_output_override_mode(output, &mode);
+	data->range.min = data->switch_modes[LOW_RR_MODE].vrefresh;
 
 	return true;
 }
@@ -500,6 +603,9 @@ static bool config_constraint(data_t *data, igt_output_t *output, uint32_t flags
 	if (!has_vrr(output))
 		return false;
 
+	if (flags & TEST_SEAMLESS_RR)
+		goto out;
+
 	/* For Negative tests, panel should be non-vrr. */
 	if ((flags & TEST_NEGATIVE) && vrr_capable(output))
 		return false;
@@ -507,7 +613,8 @@ static bool config_constraint(data_t *data, igt_output_t *output, uint32_t flags
 	if ((flags & ~TEST_NEGATIVE) && !vrr_capable(output))
 		return false;
 
-	if (!output_constraint(data, output))
+out:
+	if (!output_constraint(data, output, flags))
 		return false;
 
 	return true;
@@ -583,6 +690,12 @@ igt_main
 	igt_subtest_with_dynamic("negative-basic")
 		run_vrr_test(&data, test_basic, TEST_NEGATIVE);
 
+	igt_describe("Test to switch RR seamlessly without modeset.");
+	igt_subtest_with_dynamic("seamless-rr-switch") {
+		igt_require_intel(data.drm_fd);
+		run_vrr_test(&data, test_seamless_rr_basic, TEST_SEAMLESS_RR);
+	}
+
 	igt_fixture {
 		igt_display_fini(&data.display);
 		drm_close_driver(data.drm_fd);
-- 
2.40.0

  parent reply	other threads:[~2023-12-01 14:27 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-01 14:16 [igt-dev] [i-g-t V4 0/7] tests/kms_vrr: Add new subtest to switch RR without modeset Bhanuprakash Modem
2023-12-01 14:16 ` [igt-dev] [i-g-t V4 1/7] tests/kms_vrr: Use lib helper to print connector modes Bhanuprakash Modem
2023-12-01 14:16 ` [igt-dev] [i-g-t V4 2/7] tests/kms_vrr: Clear VRR before exit Bhanuprakash Modem
2023-12-01 14:16 ` [igt-dev] [i-g-t V4 3/7] tests/kms_vrr: Move all config constaints to new function Bhanuprakash Modem
2023-12-01 14:17 ` [igt-dev] [i-g-t V4 4/7] tests/kms_vrr: Fix bigjoiner constraint Bhanuprakash Modem
2023-12-01 14:17 ` [igt-dev] [i-g-t V4 5/7] tests/kms_vrr: Fix the logic to calculate expected rate Bhanuprakash Modem
2023-12-01 14:17 ` Bhanuprakash Modem [this message]
2023-12-04  2:35   ` [igt-dev] [i-g-t V4 6/7] tests/kms_vrr: Add new subtest to switch RR without modeset Srinivas, Vidya
2023-12-01 14:17 ` [igt-dev] [i-g-t V4 7/7] HAX: DO_NOT_MERGE: test only seamless-rr-switch Bhanuprakash Modem
2023-12-01 17:36 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/kms_vrr: Add new subtest to switch RR without modeset (rev5) Patchwork
2023-12-01 18:56 ` [igt-dev] ✗ CI.xeBAT: failure " Patchwork
2023-12-03  2:14 ` [igt-dev] ✗ Fi.CI.IGT: " Patchwork
2023-12-04  2:31 ` [igt-dev] [i-g-t V4 0/7] tests/kms_vrr: Add new subtest to switch RR without modeset Srinivas, Vidya

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231201141703.3013801-7-bhanuprakash.modem@intel.com \
    --to=bhanuprakash.modem@intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox