* [igt-dev] [PATCH i-g-t 1/4] kms_content_protection: Content type support
2019-02-26 7:23 [igt-dev] [PATCH i-g-t 0/4] Coverage for HDCP2.2 Phase II Ramalingam C
@ 2019-02-26 7:23 ` Ramalingam C
2019-02-26 7:23 ` [igt-dev] [PATCH i-g-t 2/4] kms_content_protection: test teardown and rebuild of I915-mei I/F Ramalingam C
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Ramalingam C @ 2019-02-26 7:23 UTC (permalink / raw)
To: igt-dev, daniel.vetter
Adds a connector property called "CP_Content_Type"
Content Type takes two values which classifies the content stream:
Type 0: Stream that can be tranmitted on HDCP1.4/HDCP2.2
Type 1: Stream that needs HDCP2.2 encryption only.
So when Type 1 is set KMD is forced to enable HDCP2.2 only.
For Type 0 request, Kernel chooses the highest capable HDCP version
(v2.2) first. If that fails, then it fall back to the next available
version(v1.4) before abondoning HDCP autehntication attempts.
Please note content_type is allowed to be updated when "Content
Protection" is in UNDESIRED state.
Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
---
lib/igt_kms.c | 1 +
lib/igt_kms.h | 1 +
tests/kms_content_protection.c | 72 ++++++++++++++++++++++++++++++++++--------
3 files changed, 61 insertions(+), 13 deletions(-)
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 85a911e11060..b3d1c3456157 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -199,6 +199,7 @@ const char * const igt_connector_prop_names[IGT_NUM_CONNECTOR_PROPS] = {
[IGT_CONNECTOR_BROADCAST_RGB] = "Broadcast RGB",
[IGT_CONNECTOR_CONTENT_PROTECTION] = "Content Protection",
[IGT_CONNECTOR_VRR_CAPABLE] = "vrr_capable",
+ [IGT_CONNECTOR_CP_CONTENT_TYPE] = "CP_Content_Type",
};
/*
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index 679d4e84fab8..e152b6a2ed55 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -123,6 +123,7 @@ enum igt_atomic_connector_properties {
IGT_CONNECTOR_BROADCAST_RGB,
IGT_CONNECTOR_CONTENT_PROTECTION,
IGT_CONNECTOR_VRR_CAPABLE,
+ IGT_CONNECTOR_CP_CONTENT_TYPE,
IGT_NUM_CONNECTOR_PROPS
};
diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
index 7fc8542e769a..00784e2a5f01 100644
--- a/tests/kms_content_protection.c
+++ b/tests/kms_content_protection.c
@@ -40,6 +40,13 @@ struct data {
#define CP_DESIRED 1
#define CP_ENABLED 2
+/*
+ * CP_TYPE_0 can be handled on both HDCP1.4 and HDCP2.2. Where as CP_TYPE_1
+ * can be handled only through HDCP2.2.
+ */
+#define CP_TYPE_0 0
+#define CP_TYPE_1 1
+
#define LIC_PERIOD_MSEC (4 * 1000)
/* Kernel retry count=3, Max time per authentication allowed = 6Sec */
#define KERNEL_AUTH_TIME_ALLOWED_MSEC (3 * 6 * 1000)
@@ -155,7 +162,8 @@ static void modeset_with_fb(const enum pipe pipe, igt_output_t *output,
commit_display_and_wait_for_flip(s);
}
-static bool test_cp_enable(igt_output_t *output, enum igt_commit_style s)
+static bool test_cp_enable(igt_output_t *output, enum igt_commit_style s,
+ int content_type)
{
igt_display_t *display = &data.display;
igt_plane_t *primary;
@@ -165,6 +173,9 @@ static bool test_cp_enable(igt_output_t *output, enum igt_commit_style s)
igt_output_set_prop_value(output,
IGT_CONNECTOR_CONTENT_PROTECTION, CP_DESIRED);
+ if (output->props[IGT_CONNECTOR_CP_CONTENT_TYPE])
+ igt_output_set_prop_value(output, IGT_CONNECTOR_CP_CONTENT_TYPE,
+ content_type);
igt_display_commit2(display, s);
ret = wait_for_prop_value(output, CP_ENABLED,
@@ -201,13 +212,14 @@ static void test_cp_disable(igt_output_t *output, enum igt_commit_style s)
}
static void test_cp_enable_with_retry(igt_output_t *output,
- enum igt_commit_style s, int retry)
+ enum igt_commit_style s, int retry,
+ int content_type)
{
bool ret;
do {
test_cp_disable(output, s);
- ret = test_cp_enable(output, s);
+ ret = test_cp_enable(output, s, content_type);
if (!ret && --retry)
igt_debug("Retry (%d/2) ...\n", 3 - retry);
@@ -237,7 +249,7 @@ static void test_cp_lic(igt_output_t *output)
static void test_content_protection_on_output(igt_output_t *output,
enum igt_commit_style s,
- bool dpms_test)
+ bool dpms_test, int content_type)
{
igt_display_t *display = &data.display;
igt_plane_t *primary;
@@ -258,7 +270,7 @@ static void test_content_protection_on_output(igt_output_t *output,
continue;
modeset_with_fb(pipe, output, s);
- test_cp_enable_with_retry(output, s, 3);
+ test_cp_enable_with_retry(output, s, 3, content_type);
test_cp_lic(output);
if (dpms_test) {
@@ -273,7 +285,8 @@ static void test_content_protection_on_output(igt_output_t *output,
ret = wait_for_prop_value(output, CP_ENABLED,
KERNEL_AUTH_TIME_ALLOWED_MSEC);
if (!ret)
- test_cp_enable_with_retry(output, s, 2);
+ test_cp_enable_with_retry(output, s,
+ 2, content_type);
}
test_cp_disable(output, s);
@@ -300,7 +313,8 @@ static void __debugfs_read(int fd, const char *param, char *buf, int len)
#define debugfs_read(fd, p, arr) __debugfs_read(fd, p, arr, sizeof(arr))
-#define MAX_SINK_HDCP_CAP_BUF_LEN 500
+#define MAX_SINK_HDCP_CAP_BUF_LEN 5000
+
static bool sink_hdcp_capable(igt_output_t *output)
{
char buf[MAX_SINK_HDCP_CAP_BUF_LEN];
@@ -318,9 +332,26 @@ static bool sink_hdcp_capable(igt_output_t *output)
return strstr(buf, "HDCP1.4");
}
+static bool sink_hdcp2_capable(igt_output_t *output)
+{
+ char buf[MAX_SINK_HDCP_CAP_BUF_LEN];
+ int fd;
+
+ fd = igt_debugfs_connector_dir(data.drm_fd, output->name, O_RDONLY);
+ if (fd < 0)
+ return false;
+
+ debugfs_read(fd, "i915_hdcp_sink_capability", buf);
+ close(fd);
+
+ igt_debug("Sink capability: %s\n", buf);
+
+ return strstr(buf, "HDCP2.2");
+}
static void
-test_content_protection(enum igt_commit_style s, bool dpms_test)
+test_content_protection(enum igt_commit_style s, bool dpms_test,
+ int content_type)
{
igt_display_t *display = &data.display;
igt_output_t *output;
@@ -330,14 +361,24 @@ test_content_protection(enum igt_commit_style s, bool dpms_test)
if (!output->props[IGT_CONNECTOR_CONTENT_PROTECTION])
continue;
+ if (!output->props[IGT_CONNECTOR_CP_CONTENT_TYPE] &&
+ content_type)
+ continue;
+
igt_info("CP Test execution on %s\n", output->name);
- if (!sink_hdcp_capable(output)) {
+
+ if (content_type && !sink_hdcp2_capable(output)) {
+ igt_info("\tSkip %s (Sink has no HDCP2.2 support)\n",
+ output->name);
+ continue;
+ } else if (!sink_hdcp_capable(output)) {
igt_info("\tSkip %s (Sink has no HDCP support)\n",
output->name);
continue;
}
- test_content_protection_on_output(output, s, dpms_test);
+ test_content_protection_on_output(output, s, dpms_test,
+ content_type);
valid_tests++;
}
@@ -355,16 +396,21 @@ igt_main
}
igt_subtest("legacy")
- test_content_protection(COMMIT_LEGACY, false);
+ test_content_protection(COMMIT_LEGACY, false, CP_TYPE_0);
igt_subtest("atomic") {
igt_require(data.display.is_atomic);
- test_content_protection(COMMIT_ATOMIC, false);
+ test_content_protection(COMMIT_ATOMIC, false, CP_TYPE_0);
}
igt_subtest("atomic-dpms") {
igt_require(data.display.is_atomic);
- test_content_protection(COMMIT_ATOMIC, true);
+ test_content_protection(COMMIT_ATOMIC, true, CP_TYPE_0);
+ }
+
+ igt_subtest("Type1") {
+ igt_require(data.display.is_atomic);
+ test_content_protection(COMMIT_ATOMIC, false, CP_TYPE_1);
}
igt_fixture
--
2.7.4
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 8+ messages in thread* [igt-dev] [PATCH i-g-t 2/4] kms_content_protection: test teardown and rebuild of I915-mei I/F
2019-02-26 7:23 [igt-dev] [PATCH i-g-t 0/4] Coverage for HDCP2.2 Phase II Ramalingam C
2019-02-26 7:23 ` [igt-dev] [PATCH i-g-t 1/4] kms_content_protection: Content type support Ramalingam C
@ 2019-02-26 7:23 ` Ramalingam C
2019-02-27 10:22 ` C, Ramalingam
2019-02-26 7:23 ` [igt-dev] [PATCH i-g-t 3/4] kms_content_protection: srm and downstream_info test Ramalingam C
` (3 subsequent siblings)
5 siblings, 1 reply; 8+ messages in thread
From: Ramalingam C @ 2019-02-26 7:23 UTC (permalink / raw)
To: igt-dev, daniel.vetter
To validate the teardown and rebuild of the interface between
I915 and mei hdcp this subtest execute the below sequence:
1. Test HDCP2.2 Type 1 (expected to pass)
2. Unload the mei_hdcp
3. Test HDCP2.2 Type 1 (expected to fail)
2. Reload the mei_hdcp
1. Test HDCP2.2 Type 1 (expected to pass)
Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
---
tests/kms_content_protection.c | 67 +++++++++++++++++++++++++++++++++---------
1 file changed, 53 insertions(+), 14 deletions(-)
diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
index 00784e2a5f01..4563a6067a32 100644
--- a/tests/kms_content_protection.c
+++ b/tests/kms_content_protection.c
@@ -27,6 +27,7 @@
#include "igt.h"
#include "igt_sysfs.h"
#include "igt_kms.h"
+#include "igt_kmod.h"
IGT_TEST_DESCRIPTION("Test content protection (HDCP)");
@@ -213,7 +214,7 @@ static void test_cp_disable(igt_output_t *output, enum igt_commit_style s)
static void test_cp_enable_with_retry(igt_output_t *output,
enum igt_commit_style s, int retry,
- int content_type)
+ int content_type, bool expect_failure)
{
bool ret;
@@ -224,7 +225,12 @@ static void test_cp_enable_with_retry(igt_output_t *output,
if (!ret && --retry)
igt_debug("Retry (%d/2) ...\n", 3 - retry);
} while (retry && !ret);
- igt_assert_f(ret, "Content Protection not enabled\n");
+
+ if (expect_failure)
+ igt_assert_f(!ret,
+ "CP Enabled. Though it is expected to fail\n");
+ else
+ igt_assert_f(ret, "Content Protection not enabled\n");
}
static bool igt_pipe_is_free(igt_display_t *display, enum pipe pipe)
@@ -247,9 +253,10 @@ static void test_cp_lic(igt_output_t *output)
igt_assert_f(!ret, "Content Protection LIC Failed\n");
}
-static void test_content_protection_on_output(igt_output_t *output,
- enum igt_commit_style s,
- bool dpms_test, int content_type)
+static void
+test_content_protection_on_output(igt_output_t *output, enum igt_commit_style s,
+ bool dpms_test, int content_type,
+ bool mei_reload_test)
{
igt_display_t *display = &data.display;
igt_plane_t *primary;
@@ -270,7 +277,24 @@ static void test_content_protection_on_output(igt_output_t *output,
continue;
modeset_with_fb(pipe, output, s);
- test_cp_enable_with_retry(output, s, 3, content_type);
+ test_cp_enable_with_retry(output, s, 3, content_type, false);
+
+ if (mei_reload_test) {
+ igt_assert_f(!igt_kmod_unload("mei_hdcp", 0),
+ "mei_hdcp unload failed");
+
+ /* Expected to fail */
+ test_cp_enable_with_retry(output, s, 3,
+ content_type, false, true);
+
+ igt_assert_f(!igt_kmod_load("mei_hdcp", NULL),
+ "mei_hdcp load failed");
+
+ /* Expected to pass */
+ test_cp_enable_with_retry(output, s, 3,
+ content_type, false, false);
+ }
+
test_cp_lic(output);
if (dpms_test) {
@@ -285,8 +309,8 @@ static void test_content_protection_on_output(igt_output_t *output,
ret = wait_for_prop_value(output, CP_ENABLED,
KERNEL_AUTH_TIME_ALLOWED_MSEC);
if (!ret)
- test_cp_enable_with_retry(output, s,
- 2, content_type);
+ test_cp_enable_with_retry(output, s, 2,
+ content_type, false);
}
test_cp_disable(output, s);
@@ -351,12 +375,16 @@ static bool sink_hdcp2_capable(igt_output_t *output)
static void
test_content_protection(enum igt_commit_style s, bool dpms_test,
- int content_type)
+ int content_type, bool mei_reload_test)
{
igt_display_t *display = &data.display;
igt_output_t *output;
int valid_tests = 0;
+ if (mei_reload_test)
+ igt_require_f(igt_kmod_is_loaded("mei_hdcp"),
+ "mei_hdcp module is not loaded\n");
+
for_each_connected_output(display, output) {
if (!output->props[IGT_CONNECTOR_CONTENT_PROTECTION])
continue;
@@ -378,7 +406,8 @@ test_content_protection(enum igt_commit_style s, bool dpms_test,
}
test_content_protection_on_output(output, s, dpms_test,
- content_type);
+ content_type,
+ mei_reload_test);
valid_tests++;
}
@@ -396,21 +425,31 @@ igt_main
}
igt_subtest("legacy")
- test_content_protection(COMMIT_LEGACY, false, CP_TYPE_0);
+ test_content_protection(COMMIT_LEGACY, false, CP_TYPE_0,
+ false);
igt_subtest("atomic") {
igt_require(data.display.is_atomic);
- test_content_protection(COMMIT_ATOMIC, false, CP_TYPE_0);
+ test_content_protection(COMMIT_ATOMIC, false, CP_TYPE_0,
+ false);
}
igt_subtest("atomic-dpms") {
igt_require(data.display.is_atomic);
- test_content_protection(COMMIT_ATOMIC, true, CP_TYPE_0);
+ test_content_protection(COMMIT_ATOMIC, true, CP_TYPE_0,
+ false);
}
igt_subtest("Type1") {
igt_require(data.display.is_atomic);
- test_content_protection(COMMIT_ATOMIC, false, CP_TYPE_1);
+ test_content_protection(COMMIT_ATOMIC, false, CP_TYPE_1,
+ false);
+ }
+
+ igt_subtest("type1_mei_interface") {
+ igt_require(data.display.is_atomic);
+ test_content_protection(COMMIT_ATOMIC, false, CP_TYPE_1,
+ true);
}
igt_fixture
--
2.7.4
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 8+ messages in thread* [igt-dev] [PATCH i-g-t 3/4] kms_content_protection: srm and downstream_info test
2019-02-26 7:23 [igt-dev] [PATCH i-g-t 0/4] Coverage for HDCP2.2 Phase II Ramalingam C
2019-02-26 7:23 ` [igt-dev] [PATCH i-g-t 1/4] kms_content_protection: Content type support Ramalingam C
2019-02-26 7:23 ` [igt-dev] [PATCH i-g-t 2/4] kms_content_protection: test teardown and rebuild of I915-mei I/F Ramalingam C
@ 2019-02-26 7:23 ` Ramalingam C
2019-02-26 7:23 ` [igt-dev] [PATCH i-g-t 4/4] DO NOT MERGE: CP in fast feedback list Ramalingam C
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Ramalingam C @ 2019-02-26 7:23 UTC (permalink / raw)
To: igt-dev, daniel.vetter
Retrieve the downstream info and use that to stitch a srm and
verify the revocation process.
Adds two more connector properties called CP_SRM and CP_Downstream_Info
SRM stitched here is polluted. Kernel trusts the userspace to validate
the SRM integrity through DCP signature. Actually this test exploits
that trust to test SRM and downstream_info features.
HDCP1.4 BKSV and HDCP2.2 receiver id of a HDCP sink is different. So we
need to force the KMD to use a single HDCP version across
downstream_info gathering and SRM setting and verifying teh revocation
process. So Type 1 is used.
Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
---
lib/igt_kms.c | 2 +
lib/igt_kms.h | 2 +
tests/kms_content_protection.c | 201 ++++++++++++++++++++++++++++++++++++++---
3 files changed, 191 insertions(+), 14 deletions(-)
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index b3d1c3456157..528cfe454816 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -200,6 +200,8 @@ const char * const igt_connector_prop_names[IGT_NUM_CONNECTOR_PROPS] = {
[IGT_CONNECTOR_CONTENT_PROTECTION] = "Content Protection",
[IGT_CONNECTOR_VRR_CAPABLE] = "vrr_capable",
[IGT_CONNECTOR_CP_CONTENT_TYPE] = "CP_Content_Type",
+ [IGT_CONNECTOR_CP_SRM] = "CP_SRM",
+ [IGT_CONNECTOR_CP_DOWNSTREAM_INFO] = "CP_Downstream_Info",
};
/*
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index e152b6a2ed55..f7fb88d7e5e6 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -124,6 +124,8 @@ enum igt_atomic_connector_properties {
IGT_CONNECTOR_CONTENT_PROTECTION,
IGT_CONNECTOR_VRR_CAPABLE,
IGT_CONNECTOR_CP_CONTENT_TYPE,
+ IGT_CONNECTOR_CP_SRM,
+ IGT_CONNECTOR_CP_DOWNSTREAM_INFO,
IGT_NUM_CONNECTOR_PROPS
};
diff --git a/tests/kms_content_protection.c b/tests/kms_content_protection.c
index 4563a6067a32..c41e9684deb6 100644
--- a/tests/kms_content_protection.c
+++ b/tests/kms_content_protection.c
@@ -55,6 +55,109 @@ struct data {
#define FLIP_EVENT_POLLING_TIMEOUT_MSEC 1000
+#define DRM_MODE_HDCP_KSV_LEN 5
+#define DRM_MODE_HDCP_MAX_DEVICE_CNT 127
+
+#define DRM_MODE_HDCP14_IN_FORCE (1 << 0)
+#define DRM_MODE_HDCP22_IN_FORCE (1 << 1)
+
+struct cp_downstream_info {
+ /* HDCP ver in force */
+ __u32 ver_in_force;
+ __u8 content_type;
+
+ /* KSV of immediate HDCP Sink. In Little-Endian Format. */
+ char bksv[DRM_MODE_HDCP_KSV_LEN];
+
+ /* Whether Immediate HDCP sink is a repeater? */
+ bool is_repeater;
+
+ /* Depth received from immediate downstream repeater */
+ __u8 depth;
+
+ /* Device count received from immediate downstream repeater */
+ __u32 device_count;
+
+ /*
+ * Max buffer required to hold ksv list received from immediate
+ * repeater. In this array first device_count * DRM_MODE_HDCP_KSV_LEN
+ * will hold the valid ksv bytes.
+ * If authentication specification is
+ * HDCP1.4 - each KSV's Bytes will be in Little-Endian format.
+ * HDCP2.2 - each KSV's Bytes will be in Big-Endian format.
+ */
+ char ksv_list[DRM_MODE_HDCP_KSV_LEN * DRM_MODE_HDCP_MAX_DEVICE_CNT];
+};
+
+__u8 facsimile_srm[] = {
+ 0x80, 0x0, 0x0, 0x05, 0x01, 0x0, 0x0, 0x36, 0x02, 0x51, 0x1E, 0xF2,
+ 0x1A, 0xCD, 0xE7, 0x26, 0x97, 0xF4, 0x01, 0x97, 0x10, 0x19, 0x92, 0x53,
+ 0xE9, 0xF0, 0x59, 0x95, 0xA3, 0x7A, 0x3B, 0xFE, 0xE0, 0x9C, 0x76, 0xDD,
+ 0x83, 0xAA, 0xC2, 0x5B, 0x24, 0xB3, 0x36, 0x84, 0x94, 0x75, 0x34, 0xDB,
+ 0x10, 0x9E, 0x3B, 0x23, 0x13, 0xD8, 0x7A, 0xC2, 0x30, 0x79, 0x84};
+
+static void parse_downstream_info(struct cp_downstream_info *ds_info)
+{
+ char *ksvs;
+ int i;
+
+ if (ds_info->ver_in_force & DRM_MODE_HDCP14_IN_FORCE)
+ igt_debug("HDCP1.4 is Enabled\n");
+ else if (ds_info->ver_in_force & DRM_MODE_HDCP22_IN_FORCE)
+ igt_debug("HDCP2.2 is Enabled. Type%d\n",
+ ds_info->content_type & CP_TYPE_1 ? 1 : 0);
+ else
+ return;
+
+ igt_debug("\tReceiver ID: %#04x %#04x %#04x %#04x %#04x\n",
+ ds_info->bksv[0] & 0xFF, ds_info->bksv[1] & 0xFF,
+ ds_info->bksv[2] & 0xFF, ds_info->bksv[3] & 0xFF,
+ ds_info->bksv[4] & 0xFF);
+
+ if (ds_info->is_repeater) {
+ igt_debug("\tHDCP sink is a Repeater\n");
+
+ igt_debug("\tDepth: %d, Device count: %d\n", ds_info->depth,
+ ds_info->device_count);
+ ksvs = ds_info->ksv_list;
+
+ for (i = 0; i < ds_info->device_count; i++) {
+ igt_debug("\tksv-%d: %#04x %#04x %#04x %#04x %#04x\n", i,
+ ksvs[0] & 0xFF, ksvs[1] & 0xFF,
+ ksvs[2] & 0xFF, ksvs[3] & 0xFF,
+ ksvs[4] & 0xFF);
+ ksvs += DRM_MODE_HDCP_KSV_LEN;
+ }
+ } else {
+ igt_debug("\tHDCP sink is a Receiver\n");
+ }
+}
+
+static void retrieve_downstream_info_prepare_srm(igt_output_t *output)
+{
+ drmModePropertyBlobRes *ds_info_prop = NULL;
+ uint64_t downstream_blob_id;
+ struct cp_downstream_info *ds_info;
+ int i;
+
+ igt_debug("CP_downstream_info property is attached\n");
+
+ downstream_blob_id =
+ igt_output_get_prop(output, IGT_CONNECTOR_CP_DOWNSTREAM_INFO);
+
+ igt_assert_f(downstream_blob_id, "Invalid downstream blob id\n");
+ ds_info_prop = drmModeGetPropertyBlob(data.drm_fd, downstream_blob_id);
+
+ igt_assert(ds_info_prop);
+ igt_assert_eq(ds_info_prop->length, sizeof(struct cp_downstream_info));
+ ds_info = ds_info_prop->data;
+
+ parse_downstream_info(ds_info);
+
+ for (i = 0; i < 5; i++)
+ facsimile_srm[i + 9] = ds_info->bksv[i];
+}
+
static void flip_handler(int fd, unsigned int sequence, unsigned int tv_sec,
unsigned int tv_usec, void *_data)
{
@@ -164,7 +267,7 @@ static void modeset_with_fb(const enum pipe pipe, igt_output_t *output,
}
static bool test_cp_enable(igt_output_t *output, enum igt_commit_style s,
- int content_type)
+ int content_type, bool test_srm)
{
igt_display_t *display = &data.display;
igt_plane_t *primary;
@@ -172,6 +275,25 @@ static bool test_cp_enable(igt_output_t *output, enum igt_commit_style s,
primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
+ if (output->props[IGT_CONNECTOR_CP_SRM]) {
+ if (test_srm) {
+ igt_debug("CP_SRM property is updated with SRM\n");
+
+ /* Set SRM Blob to CR_SRM property */
+ igt_output_replace_prop_blob(output,
+ IGT_CONNECTOR_CP_SRM,
+ facsimile_srm,
+ sizeof(facsimile_srm));
+ } else if (output->values[IGT_CONNECTOR_CP_SRM]) {
+ igt_debug("CP_SRM property is cleared\n");
+
+ /* Set SRM Blob to CR_SRM property */
+ igt_output_replace_prop_blob(output,
+ IGT_CONNECTOR_CP_SRM,
+ NULL, 0);
+ }
+ }
+
igt_output_set_prop_value(output,
IGT_CONNECTOR_CONTENT_PROTECTION, CP_DESIRED);
if (output->props[IGT_CONNECTOR_CP_CONTENT_TYPE])
@@ -214,13 +336,14 @@ static void test_cp_disable(igt_output_t *output, enum igt_commit_style s)
static void test_cp_enable_with_retry(igt_output_t *output,
enum igt_commit_style s, int retry,
- int content_type, bool expect_failure)
+ int content_type, bool expect_failure,
+ bool test_srm)
{
bool ret;
do {
test_cp_disable(output, s);
- ret = test_cp_enable(output, s, content_type);
+ ret = test_cp_enable(output, s, content_type, test_srm);
if (!ret && --retry)
igt_debug("Retry (%d/2) ...\n", 3 - retry);
@@ -229,6 +352,9 @@ static void test_cp_enable_with_retry(igt_output_t *output,
if (expect_failure)
igt_assert_f(!ret,
"CP Enabled. Though it is expected to fail\n");
+ else if (test_srm)
+ igt_assert_f(!ret,
+ "CP Enabled. Though ID is revoked through SRM\n");
else
igt_assert_f(ret, "Content Protection not enabled\n");
}
@@ -256,12 +382,12 @@ static void test_cp_lic(igt_output_t *output)
static void
test_content_protection_on_output(igt_output_t *output, enum igt_commit_style s,
bool dpms_test, int content_type,
- bool mei_reload_test)
+ bool mei_reload_test, bool test_srm)
{
igt_display_t *display = &data.display;
igt_plane_t *primary;
enum pipe pipe;
- bool ret;
+ bool ret, srm_modified = false;
for_each_pipe(display, pipe) {
if (!igt_pipe_connector_valid(pipe, output))
@@ -276,8 +402,10 @@ test_content_protection_on_output(igt_output_t *output, enum igt_commit_style s,
if (!igt_pipe_is_free(display, pipe))
continue;
+ srm_modified = false;
modeset_with_fb(pipe, output, s);
- test_cp_enable_with_retry(output, s, 3, content_type, false);
+ test_cp_enable_with_retry(output, s, 3, content_type, false,
+ false);
if (mei_reload_test) {
igt_assert_f(!igt_kmod_unload("mei_hdcp", 0),
@@ -297,6 +425,23 @@ test_content_protection_on_output(igt_output_t *output, enum igt_commit_style s,
test_cp_lic(output);
+ if (output->props[IGT_CONNECTOR_CP_DOWNSTREAM_INFO] &&
+ output->props[IGT_CONNECTOR_CP_SRM] &&
+ test_srm) {
+ retrieve_downstream_info_prepare_srm(output);
+ srm_modified = true;
+ }
+
+ if (test_srm && srm_modified) {
+ test_cp_disable(output, s);
+ test_cp_enable_with_retry(output, s, 3, content_type,
+ false, test_srm);
+
+ /* Destroy the SRM Blob */
+ test_cp_enable_with_retry(output, s, 1, content_type,
+ false, false);
+ }
+
if (dpms_test) {
igt_pipe_set_prop_value(display, pipe,
IGT_CRTC_ACTIVE, 0);
@@ -310,7 +455,8 @@ test_content_protection_on_output(igt_output_t *output, enum igt_commit_style s,
KERNEL_AUTH_TIME_ALLOWED_MSEC);
if (!ret)
test_cp_enable_with_retry(output, s, 2,
- content_type, false);
+ content_type, false,
+ false);
}
test_cp_disable(output, s);
@@ -375,7 +521,8 @@ static bool sink_hdcp2_capable(igt_output_t *output)
static void
test_content_protection(enum igt_commit_style s, bool dpms_test,
- int content_type, bool mei_reload_test)
+ int content_type, bool mei_reload_test,
+ bool test_srm)
{
igt_display_t *display = &data.display;
igt_output_t *output;
@@ -407,7 +554,7 @@ test_content_protection(enum igt_commit_style s, bool dpms_test,
test_content_protection_on_output(output, s, dpms_test,
content_type,
- mei_reload_test);
+ mei_reload_test, test_srm);
valid_tests++;
}
@@ -426,30 +573,56 @@ igt_main
igt_subtest("legacy")
test_content_protection(COMMIT_LEGACY, false, CP_TYPE_0,
- false);
+ false, false);
igt_subtest("atomic") {
igt_require(data.display.is_atomic);
test_content_protection(COMMIT_ATOMIC, false, CP_TYPE_0,
- false);
+ false, false);
}
igt_subtest("atomic-dpms") {
igt_require(data.display.is_atomic);
test_content_protection(COMMIT_ATOMIC, true, CP_TYPE_0,
- false);
+ false, false);
}
igt_subtest("Type1") {
igt_require(data.display.is_atomic);
test_content_protection(COMMIT_ATOMIC, false, CP_TYPE_1,
- false);
+ false, false);
}
igt_subtest("type1_mei_interface") {
igt_require(data.display.is_atomic);
test_content_protection(COMMIT_ATOMIC, false, CP_TYPE_1,
- true);
+ true, false);
+ }
+
+ /*
+ * SRM subtest perform the HDCP authentication, and then retrieve the
+ * receiver id through downstream info.
+ *
+ * Using the receiver ID, facsimile SRM table is modified with
+ * receiver ID retrieved from the downstream info. After modification
+ * SRM table is not intact as per DCP Signature.
+ *
+ * But Kernel believes userspace and doesn't verify the DCP signature.
+ * So we can exploite that trust to test the SRM and downstream info
+ * features.
+ *
+ * So when modified SRM is applied Authentication will fail due to
+ * receiver ID revocation.
+ *
+ * And Kernel attempts HDCP2.2 always and on failure of it HDCP1.4
+ * will be attempted. But their ID of the sink varies between 1.4 and
+ * 2.2 versions. So we need to stick to one version. Hence HDCP2.2 is
+ * chosen using Type 1.
+ */
+ igt_subtest("srm") {
+ igt_require(data.display.is_atomic);
+ test_content_protection(COMMIT_ATOMIC, false, CP_TYPE_1,
+ false, true);
}
igt_fixture
--
2.7.4
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 8+ messages in thread