From: Suraj Kandpal <suraj.kandpal@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: pranay.samala@intel.com, ankit.k.nautiyal@intel.com,
jeevan.b@intel.com, Suraj Kandpal <suraj.kandpal@intel.com>
Subject: [PATCH i-g-t 5/5] tests/kms_content_protection: Set screen red/green based on CP Status
Date: Thu, 22 Aug 2024 11:41:50 +0530 [thread overview]
Message-ID: <20240822061150.4127413-6-suraj.kandpal@intel.com> (raw)
In-Reply-To: <20240822061150.4127413-1-suraj.kandpal@intel.com>
Set fb as red when HDCP is disabled and green when HDCP is enabled
rather than randomly setting the color. This helps to visually
verify HDCP's enablement status rather than having to look at the
logs.
--v2
-Add reason for this change in commit message [Jeevan]
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Reviewed-by: Jeevan B <jeevan.b@intel.com>
---
tests/kms_content_protection.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
index d6c8344e2..3cb432ded 100644
--- a/tests/kms_content_protection.c
+++ b/tests/kms_content_protection.c
@@ -524,12 +524,11 @@ static bool sink_hdcp2_capable(igt_output_t *output)
return strstr(buf, "HDCP2.2");
}
-static void prepare_modeset_on_mst_output(igt_output_t *output)
+static void prepare_modeset_on_mst_output(igt_output_t *output, bool is_enabled)
{
drmModeModeInfo *mode;
igt_plane_t *primary;
int width, height;
- enum pipe pipe = output->pending_pipe;
mode = igt_output_get_mode(output);
@@ -538,8 +537,8 @@ static void prepare_modeset_on_mst_output(igt_output_t *output)
primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
igt_plane_set_fb(primary, NULL);
- igt_plane_set_fb(primary, pipe % 2 ? &data.red : &data.green);
- igt_fb_set_size(pipe % 2 ? &data.red : &data.green, primary, width, height);
+ igt_plane_set_fb(primary, is_enabled ? &data.green : &data.red);
+ igt_fb_set_size(is_enabled ? &data.green : &data.red, primary, width, height);
igt_plane_set_size(primary, width, height);
}
@@ -733,7 +732,7 @@ test_content_protection_mst(int content_type)
igt_assert_f(pipe_found, "No valid pipe found for %s\n", output->name);
igt_output_set_pipe(output, pipe);
- prepare_modeset_on_mst_output(output);
+ prepare_modeset_on_mst_output(output, false);
dp_mst_outputs++;
if (output_hdcp_capable(output, content_type))
hdcp_mst_output[valid_outputs++] = output;
@@ -750,7 +749,7 @@ test_content_protection_mst(int content_type)
igt_require_f(found, "No valid mode combo found for MST modeset\n");
for (count = 0; count < valid_outputs; count++)
- prepare_modeset_on_mst_output(hdcp_mst_output[count]);
+ prepare_modeset_on_mst_output(hdcp_mst_output[count], false);
ret = igt_display_try_commit2(display, COMMIT_ATOMIC);
igt_require_f(ret == 0, "Commit failure during MST modeset\n");
@@ -760,6 +759,13 @@ test_content_protection_mst(int content_type)
ret = test_mst_cp_enable_with_retry(hdcp_mst_output, valid_outputs, 2, content_type);
+ if (ret) {
+ for (i = 0; i < valid_outputs; i++)
+ prepare_modeset_on_mst_output(hdcp_mst_output[count], true);
+
+ igt_display_commit2(display, COMMIT_ATOMIC);
+ }
+
if (data.cp_tests & CP_LIC)
test_cp_lic_on_mst(hdcp_mst_output, valid_outputs, 0);
--
2.43.2
next prev parent reply other threads:[~2024-08-22 6:14 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-22 6:11 [PATCH i-g-t 0/5] Improve MST HDCP tests Suraj Kandpal
2024-08-22 6:11 ` [PATCH i-g-t 1/5] tests/kms_content_protection: Move HDCP output checks earlier Suraj Kandpal
2024-08-22 6:11 ` [PATCH i-g-t 2/5] tests/kms_content_protection: Move try commit call Suraj Kandpal
2024-08-22 6:11 ` [PATCH i-g-t 3/5] tests/kms_content_protection: Rename igt_commit_style variable Suraj Kandpal
2024-08-22 6:11 ` [PATCH i-g-t 4/5] tests/kms_content_protection: Add retry logic for mst usecase Suraj Kandpal
2024-08-23 4:32 ` B, Jeevan
2024-08-22 6:11 ` Suraj Kandpal [this message]
2024-08-22 7:25 ` ✓ CI.xeBAT: success for Improve MST HDCP tests (rev3) Patchwork
2024-08-22 7:25 ` ✓ Fi.CI.BAT: " Patchwork
2024-08-22 10:57 ` ✗ CI.xeFULL: failure " Patchwork
2024-08-23 5:08 ` ✗ Fi.CI.IGT: " Patchwork
2024-08-27 5:21 ` [PATCH i-g-t 0/5] Improve MST HDCP tests B, Jeevan
-- strict thread matches above, loose matches on Subject: below --
2024-08-27 6:18 Suraj Kandpal
2024-08-27 6:19 ` [PATCH i-g-t 5/5] tests/kms_content_protection: Set screen red/green based on CP Status Suraj Kandpal
2024-08-20 8:12 [PATCH i-g-t 0/5] Improve MST HDCP tests Suraj Kandpal
2024-08-20 8:12 ` [PATCH i-g-t 5/5] tests/kms_content_protection: Set screen red/green based on CP Status Suraj Kandpal
2024-08-21 14:49 ` B, Jeevan
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=20240822061150.4127413-6-suraj.kandpal@intel.com \
--to=suraj.kandpal@intel.com \
--cc=ankit.k.nautiyal@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=jeevan.b@intel.com \
--cc=pranay.samala@intel.com \
/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