Skip to contentSkip to conversation

HDCP2.2 Phase II

PATCH In review Ramalingam C 4 participants 14 messages Aug 1, 2019 – Aug 14, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

v12 cover HDCP2.2 Phase II

Series adds the content_type support for HDCP2.2. Along with that uevent is sent for each HDCP state change triggered within kernel.

Pekka have completed the Weston DRM-backend review in
https://gitlab.freedesktop.org/wayland/weston/merge_requests/48
and the UAPI for HDCP 2.2 looks good.

The userspace is accepted in Weston.

v12:
DRM_MODE_HDCP_CONTENT_TYPEx definition are moved into drm_hdcp.h
[pekka]
Picked Acked-by and R-by from reviewers.

Test-with: <[email protected]>

Ramalingam C (6):
drm: Add Content protection type property drm/i915: Attach content type property
drm: uevent for connector status change drm/hdcp: update content protection property with uevent drm/i915: update the hdcp state with uevent drm/hdcp: reference for srm file format

 drivers/gpu/drm/drm_atomic_uapi.c         |  4 ++
 drivers/gpu/drm/drm_connector.c           | 68 ++++++++++++++++++--
 drivers/gpu/drm/drm_hdcp.c                | 77 ++++++++++++++++++++++-
 drivers/gpu/drm/drm_sysfs.c               | 35 +++++++++++
 drivers/gpu/drm/i915/display/intel_ddi.c  | 39 ++++++++++--
 drivers/gpu/drm/i915/display/intel_hdcp.c | 53 ++++++++++------
 drivers/gpu/drm/i915/display/intel_hdcp.h |  2 +-
 include/drm/drm_connector.h               |  7 +++
 include/drm/drm_hdcp.h                    |  9 ++-
 include/drm/drm_mode_config.h             |  6 ++
 include/drm/drm_sysfs.h                   |  5 +-
 11 files changed, 271 insertions(+), 34 deletions(-)
Signature · 6 lines
2.19.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH v12 1/6 drm: Add Content protection type property

This patch adds a DRM ENUM property to the selected connectors. This property is used for mentioning the protected content's type from userspace to kernel HDCP authentication.

Type of the stream is decided by the protected content providers. Type 0 content can be rendered on any HDCP protected display wires. But Type 1 content can be rendered only on HDCP2.2 protected paths.

So when a userspace sets this property to Type 1 and starts the HDCP enable, kernel will honour it only if HDCP2.2 authentication is through for type 1. Else HDCP enable will be failed.

Pekka have completed the Weston DRM-backend review in
https://gitlab.freedesktop.org/wayland/weston/merge_requests/48
and the UAPI for HDCP 2.2 looks good.

The userspace is accepted in Weston.

v2:
cp_content_type is replaced with content_protection_type [daniel] check at atomic_set_property is removed [Maarten]
v3:
%s/content_protection_type/hdcp_content_type [Pekka]
v4:
property is created for the first requested connector and then reused.
[Danvet]
v5:
kernel doc nits addressed [Daniel]
Rebased as part of patch reordering.
v6:
Kernel docs are modified [pekka]
v7:
More details in Kernel docs. [pekka]
v8:
Few more clarification into kernel doc of content type [pekka]
v9:
Small fixes in coding style.
v10:
Moving DRM_MODE_HDCP_CONTENT_TYPEx definition to drm_hdcp.h [pekka]

---
 drivers/gpu/drm/drm_atomic_uapi.c         |  4 ++
 drivers/gpu/drm/drm_connector.c           | 51 +++++++++++++++++++++++
 drivers/gpu/drm/drm_hdcp.c                | 36 +++++++++++++++-
 drivers/gpu/drm/i915/display/intel_hdcp.c |  4 +-
 include/drm/drm_connector.h               |  7 ++++
 include/drm/drm_hdcp.h                    |  7 +++-
 include/drm/drm_mode_config.h             |  6 +++
 7 files changed, 112 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_atomic_uapi.c +4 -0
index abe38bdf85ae..19ae119f1a5d 100644
@@ -747,6 +747,8 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector,
 			return -EINVAL;
 		}
 		state->content_protection = val;
+	} else if (property == config->hdcp_content_type_property) {
+		state->hdcp_content_type = val;
 	} else if (property == connector->colorspace_property) {
 		state->colorspace = val;
 	} else if (property == config->writeback_fb_id_property) {
@@ -831,6 +833,8 @@ drm_atomic_connector_get_property(struct drm_connector *connector,
 			state->hdr_output_metadata->base.id : 0;
 	} else if (property == config->content_protection_property) {
 		*val = state->content_protection;
+	} else if (property == config->hdcp_content_type_property) {
+		*val = state->hdcp_content_type;
 	} else if (property == config->writeback_fb_id_property) {
 		/* Writeback framebuffer is one-shot, write and forget */
 		*val = 0;
drivers/gpu/drm/drm_connector.c +51 -0

57 lines not on this page · raw message

drivers/gpu/drm/drm_hdcp.c +35 -1
index cd837bd409f7..ce235fd1c844 100644
@@ -344,23 +344,41 @@ static struct drm_prop_enum_list drm_cp_enum_list[] = {
 };
 DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list)
 
+static struct drm_prop_enum_list drm_hdcp_content_type_enum_list[] = {
+	{ DRM_MODE_HDCP_CONTENT_TYPE0, "HDCP Type0" },
+	{ DRM_MODE_HDCP_CONTENT_TYPE1, "HDCP Type1" },
+};
+DRM_ENUM_NAME_FN(drm_get_hdcp_content_type_name,
+		 drm_hdcp_content_type_enum_list)
+
 /**
  * drm_connector_attach_content_protection_property - attach content protection
  * property
  *
  * @connector: connector to attach CP property on.
+ * @hdcp_content_type: is HDCP Content Type property needed for connector
  *
  * This is used to add support for content protection on select connectors.
  * Content Protection is intentionally vague to allow for different underlying
  * technologies, however it is most implemented by HDCP.
  *
+ * When hdcp_content_type is true enum property called HDCP Content Type is
+ * created (if it is not already) and attached to the connector.
+ *
+ * This property is used for sending the protected content's stream type
+ * from userspace to kernel on selected connectors. Protected content provider
+ * will decide their type of their content and declare the same to kernel.
+ *
+ * Content type will be used during the HDCP 2.2 authentication.
+ * Content type will be set to &drm_connector_state.hdcp_content_type.
+ *
  * The content protection will be set to &drm_connector_state.content_protection
  *
  * Returns:
  * Zero on success, negative errno on failure.
  */
 int drm_connector_attach_content_protection_property(
-		struct drm_connector *connector)
+		struct drm_connector *connector, bool hdcp_content_type)
 {
 	struct drm_device *dev = connector->dev;
 	struct drm_property *prop =
@@ -377,6 +395,22 @@ int drm_connector_attach_content_protection_property(
 				   DRM_MODE_CONTENT_PROTECTION_UNDESIRED);
 	dev->mode_config.content_protection_property = prop;
 
+	if (!hdcp_content_type)
+		return 0;
+
+	prop = dev->mode_config.hdcp_content_type_property;
+	if (!prop)
+		prop = drm_property_create_enum(dev, 0, "HDCP Content Type",
+					drm_hdcp_content_type_enum_list,
+					ARRAY_SIZE(
+					drm_hdcp_content_type_enum_list));
+	if (!prop)
+		return -ENOMEM;
+
+	drm_object_attach_property(&connector->base, prop,
+				   DRM_MODE_HDCP_CONTENT_TYPE0);
+	dev->mode_config.hdcp_content_type_property = prop;
+
 	return 0;
 }
 EXPORT_SYMBOL(drm_connector_attach_content_protection_property);
drivers/gpu/drm/i915/display/intel_hdcp.c +3 -1
index 1ffc1e61c2be..deef0e747251 100644
@@ -1836,7 +1836,9 @@ int intel_hdcp_init(struct intel_connector *connector,
 	if (!shim)
 		return -EINVAL;
 
-	ret = drm_connector_attach_content_protection_property(&connector->base);
+	ret =
+	drm_connector_attach_content_protection_property(&connector->base,
+							 false);
 	if (ret)
 		return ret;
 
include/drm/drm_connector.h +7 -0
index fc5d08438333..0b9997e27689 100644
@@ -602,6 +602,12 @@ struct drm_connector_state {
 	 */
 	unsigned int content_type;
 
+	/**
+	 * @hdcp_content_type: Connector property to pass the type of
+	 * protected content. This is most commonly used for HDCP.
+	 */
+	unsigned int hdcp_content_type;
+
 	/**
 	 * @scaling_mode: Connector property to control the
 	 * upscaling, mostly used for built-in panels.
@@ -1502,6 +1508,7 @@ const char *drm_get_dvi_i_select_name(int val);
 const char *drm_get_tv_subconnector_name(int val);
 const char *drm_get_tv_select_name(int val);
 const char *drm_get_content_protection_name(int val);
+const char *drm_get_hdcp_content_type_name(int val);
 
 int drm_mode_create_dvi_i_properties(struct drm_device *dev);
 int drm_mode_create_tv_margin_properties(struct drm_device *dev);
include/drm/drm_hdcp.h +6 -1
index 13771a496e2b..82447af98aa2 100644
@@ -291,5 +291,10 @@ struct drm_connector;
 bool drm_hdcp_check_ksvs_revoked(struct drm_device *dev,
 				 u8 *ksvs, u32 ksv_count);
 int drm_connector_attach_content_protection_property(
-		struct drm_connector *connector);
+		struct drm_connector *connector, bool hdcp_content_type);
+
+/* Content Type classification for HDCP2.2 vs others */
+#define DRM_MODE_HDCP_CONTENT_TYPE0		0
+#define DRM_MODE_HDCP_CONTENT_TYPE1		1
+
 #endif
include/drm/drm_mode_config.h +6 -0
index f57eea0481e0..3bcbe30339f0 100644
@@ -849,6 +849,12 @@ struct drm_mode_config {
 	 */
 	struct drm_property *content_protection_property;
 
+	/**
+	 * @hdcp_content_type_property: DRM ENUM property for type of
+	 * Protected Content.
+	 */
+	struct drm_property *hdcp_content_type_property;
+
 	/* dumb ioctl parameters */
 	uint32_t preferred_depth, prefer_shadow;
 
Signature · 6 lines
2.19.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

PATCH v12 2/6 drm/i915: Attach content type property

In reply to Ramalingam C

Attaches the content type property for HDCP2.2 capable connectors.

Implements the update of content type from property and apply the restriction on HDCP version selection.

Need ACK for content type property from userspace consumer.

v2:
s/cp_content_type/content_protection_type [daniel] disable at hdcp_atomic_check to avoid check at atomic_set_property
[Maarten]
v3:
s/content_protection_type/hdcp_content_type [Pekka]
v4:
hdcp disable incase of type change is moved into commit [daniel].
v5:
Simplified the Type change procedure. [Daniel]
v6:
Type change with UNDESIRED state is ignored.

---
 drivers/gpu/drm/i915/display/intel_ddi.c  | 39 ++++++++++++++++----
 drivers/gpu/drm/i915/display/intel_hdcp.c | 43 +++++++++++++++--------
 drivers/gpu/drm/i915/display/intel_hdcp.h |  2 +-
 3 files changed, 62 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +33 -6
index fb58845020dc..b9c22deafe22 100644
@@ -3569,7 +3569,8 @@ static void intel_enable_ddi(struct intel_encoder *encoder,
 	/* Enable hdcp if it's desired */
 	if (conn_state->content_protection ==
 	    DRM_MODE_CONTENT_PROTECTION_DESIRED)
-		intel_hdcp_enable(to_intel_connector(conn_state->connector));
+		intel_hdcp_enable(to_intel_connector(conn_state->connector),
+				  (u8)conn_state->hdcp_content_type);
 }
 
 static void intel_disable_ddi_dp(struct intel_encoder *encoder,
@@ -3638,15 +3639,41 @@ static void intel_ddi_update_pipe(struct intel_encoder *encoder,
 				  const struct intel_crtc_state *crtc_state,
 				  const struct drm_connector_state *conn_state)
 {
+	struct intel_connector *connector =
+				to_intel_connector(conn_state->connector);
+	struct intel_hdcp *hdcp = &connector->hdcp;
+	bool content_protection_type_changed =
+			(conn_state->hdcp_content_type != hdcp->content_type &&
+			 conn_state->content_protection !=
+			 DRM_MODE_CONTENT_PROTECTION_UNDESIRED);
+
 	if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI))
 		intel_ddi_update_pipe_dp(encoder, crtc_state, conn_state);
 
+	/*
+	 * During the HDCP encryption session if Type change is requested,
+	 * disable the HDCP and reenable it with new TYPE value.
+	 */
 	if (conn_state->content_protection ==
-	    DRM_MODE_CONTENT_PROTECTION_DESIRED)
-		intel_hdcp_enable(to_intel_connector(conn_state->connector));
-	else if (conn_state->content_protection ==
-		 DRM_MODE_CONTENT_PROTECTION_UNDESIRED)
-		intel_hdcp_disable(to_intel_connector(conn_state->connector));
+	    DRM_MODE_CONTENT_PROTECTION_UNDESIRED ||
+	    content_protection_type_changed)
+		intel_hdcp_disable(connector);
+
+	/*
+	 * Mark the hdcp state as DESIRED after the hdcp disable of type
+	 * change procedure.
+	 */
+	if (content_protection_type_changed) {
+		mutex_lock(&hdcp->mutex);
+		hdcp->value = DRM_MODE_CONTENT_PROTECTION_DESIRED;
+		schedule_work(&hdcp->prop_work);
+		mutex_unlock(&hdcp->mutex);
+	}
+
+	if (conn_state->content_protection ==
+	    DRM_MODE_CONTENT_PROTECTION_DESIRED ||
+	    content_protection_type_changed)
+		intel_hdcp_enable(connector, (u8)conn_state->hdcp_content_type);
 }
 
 static void
drivers/gpu/drm/i915/display/intel_hdcp.c +28 -15

105 lines not on this page · raw message

drivers/gpu/drm/i915/display/intel_hdcp.h +1 -1
index be8da85c866a..13555b054930 100644
@@ -21,7 +21,7 @@ void intel_hdcp_atomic_check(struct drm_connector *connector,
 			     struct drm_connector_state *new_state);
 int intel_hdcp_init(struct intel_connector *connector,
 		    const struct intel_hdcp_shim *hdcp_shim);
-int intel_hdcp_enable(struct intel_connector *connector);
+int intel_hdcp_enable(struct intel_connector *connector, u8 content_type);
 int intel_hdcp_disable(struct intel_connector *connector);
 bool is_hdcp_supported(struct drm_i915_private *dev_priv, enum port port);
 bool intel_hdcp_capable(struct intel_connector *connector);
Signature · 6 lines
2.19.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#3 lore raw

PATCH v12 3/6 drm: uevent for connector status change

In reply to Ramalingam C

DRM API for generating uevent for a status changes of connector's property.

This uevent will have following details related to the status change:

HOTPLUG=1, CONNECTOR=<connector_id> and PROPERTY=<property_id>

Pekka have completed the Weston DRM-backend review in
https://gitlab.freedesktop.org/wayland/weston/merge_requests/48
and the UAPI for HDCP 2.2 looks good.

The userspace is accepted in Weston.

v2:
Minor fixes at KDoc comments [Daniel]
v3:
Check the property is really attached with connector [Daniel]
v4:
Typos and string length suggestions are addressed [Sean]

---
 drivers/gpu/drm/drm_sysfs.c | 35 +++++++++++++++++++++++++++++++++++
 include/drm/drm_sysfs.h     |  5 ++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_sysfs.c +35 -0
index e962a9d45f7e..dd2bc85f43cc 100644
@@ -27,6 +27,7 @@
 #include <drm/drm_sysfs.h>
 
 #include "drm_internal.h"
+#include "drm_crtc_internal.h"
 
 #define to_drm_minor(d) dev_get_drvdata(d)
 #define to_drm_connector(d) dev_get_drvdata(d)
@@ -333,6 +334,9 @@ void drm_sysfs_lease_event(struct drm_device *dev)
  * Send a uevent for the DRM device specified by @dev.  Currently we only
  * set HOTPLUG=1 in the uevent environment, but this could be expanded to
  * deal with other types of events.
+ *
+ * Any new uapi should be using the drm_sysfs_connector_status_event()
+ * for uevents on connector status change.
  */
 void drm_sysfs_hotplug_event(struct drm_device *dev)
 {
@@ -345,6 +349,37 @@ void drm_sysfs_hotplug_event(struct drm_device *dev)
 }
 EXPORT_SYMBOL(drm_sysfs_hotplug_event);
 
+/**
+ * drm_sysfs_connector_status_event - generate a DRM uevent for connector
+ * property status change
+ * @connector: connector on which property status changed
+ * @property: connector property whose status changed.
+ *
+ * Send a uevent for the DRM device specified by @dev.  Currently we
+ * set HOTPLUG=1 and connector id along with the attached property id
+ * related to the status change.
+ */
+void drm_sysfs_connector_status_event(struct drm_connector *connector,
+				      struct drm_property *property)
+{
+	struct drm_device *dev = connector->dev;
+	char hotplug_str[] = "HOTPLUG=1", conn_id[21], prop_id[21];
+	char *envp[4] = { hotplug_str, conn_id, prop_id, NULL };
+
+	WARN_ON(!drm_mode_obj_find_prop_id(&connector->base,
+					   property->base.id));
+
+	snprintf(conn_id, ARRAY_SIZE(conn_id),
+		 "CONNECTOR=%u", connector->base.id);
+	snprintf(prop_id, ARRAY_SIZE(prop_id),
+		 "PROPERTY=%u", property->base.id);
+
+	DRM_DEBUG("generating connector status event\n");
+
+	kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, envp);
+}
+EXPORT_SYMBOL(drm_sysfs_connector_status_event);
+
 static void drm_sysfs_release(struct device *dev)
 {
 	kfree(dev);
include/drm/drm_sysfs.h +4 -1
index 4f311e836cdc..d454ef617b2c 100644
@@ -4,10 +4,13 @@
 
 struct drm_device;
 struct device;
+struct drm_connector;
+struct drm_property;
 
 int drm_class_device_register(struct device *dev);
 void drm_class_device_unregister(struct device *dev);
 
 void drm_sysfs_hotplug_event(struct drm_device *dev);
-
+void drm_sysfs_connector_status_event(struct drm_connector *connector,
+				      struct drm_property *property);
 #endif
Signature · 6 lines
2.19.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw

PATCH v12 4/6 drm/hdcp: update content protection property with uevent

In reply to Ramalingam C

drm function is defined and exported to update a connector's content protection property state and to generate a uevent along with it.

Pekka have completed the Weston DRM-backend review in
https://gitlab.freedesktop.org/wayland/weston/merge_requests/48
and the UAPI for HDCP 2.2 looks good.

The userspace is accepted in Weston.

v2:
Update only when state is different from old one.
v3:
KDoc is added [Daniel]
v4:
KDoc is extended bit more [pekka]
v5:
Uevent usage is documented at kdoc of "Content Protection" also [pekka]

---
 drivers/gpu/drm/drm_connector.c | 17 +++++++++++++----
 drivers/gpu/drm/drm_hdcp.c      | 34 +++++++++++++++++++++++++++++++++
 include/drm/drm_hdcp.h          |  2 ++
 3 files changed, 49 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_connector.c +13 -4
index cddb97f75415..354798bad576 100644
@@ -983,10 +983,19 @@ static const struct drm_prop_enum_list hdmi_colorspaces[] = {
  *	- If the state is DESIRED, kernel should attempt to re-authenticate the
  *	  link whenever possible. This includes across disable/enable, dpms,
  *	  hotplug, downstream device changes, link status failures, etc..
- *	- Userspace is responsible for polling the property to determine when
- *	  the value transitions from ENABLED to DESIRED. This signifies the link
- *	  is no longer protected and userspace should take appropriate action
- *	  (whatever that might be).
+ *	- Kernel sends uevent with the connector id and property id through
+ *	  @drm_hdcp_update_content_protection, upon below kernel triggered
+ *	  scenarios:
+ *		DESIRED -> ENABLED	(authentication success)
+ *		ENABLED -> DESIRED	(termination of authentication)
+ *	- Please note no uevents for userspace triggered property state changes,
+ *	  which can't fail such as
+ *		DESIRED/ENABLED -> UNDESIRED
+ *		UNDESIRED -> DESIRED
+ *	- Userspace is responsible for polling the property or listen to uevents
+ *	  to determine when the value transitions from ENABLED to DESIRED.
+ *	  This signifies the link is no longer protected and userspace should
+ *	  take appropriate action (whatever that might be).
  *
  * HDCP Content Type:
  *	This Enum property is used by the userspace to declare the content type
drivers/gpu/drm/drm_hdcp.c +34 -0
index ce235fd1c844..77433ee3d652 100644
@@ -374,6 +374,10 @@ DRM_ENUM_NAME_FN(drm_get_hdcp_content_type_name,
  *
  * The content protection will be set to &drm_connector_state.content_protection
  *
+ * When kernel triggered content protection state change like DESIRED->ENABLED
+ * and ENABLED->DESIRED, will use drm_hdcp_update_content_protection() to update
+ * the content protection state of a connector.
+ *
  * Returns:
  * Zero on success, negative errno on failure.
  */
@@ -414,3 +418,33 @@ int drm_connector_attach_content_protection_property(
 	return 0;
 }
 EXPORT_SYMBOL(drm_connector_attach_content_protection_property);
+
+/**
+ * drm_hdcp_update_content_protection - Updates the content protection state
+ * of a connector
+ *
+ * @connector: drm_connector on which content protection state needs an update
+ * @val: New state of the content protection property
+ *
+ * This function can be used by display drivers, to update the kernel triggered
+ * content protection state changes of a drm_connector such as DESIRED->ENABLED
+ * and ENABLED->DESIRED. No uevent for DESIRED->UNDESIRED or ENABLED->UNDESIRED,
+ * as userspace is triggering such state change and kernel performs it without
+ * fail.This function update the new state of the property into the connector's
+ * state and generate an uevent to notify the userspace.
+ */
+void drm_hdcp_update_content_protection(struct drm_connector *connector,
+					u64 val)
+{
+	struct drm_device *dev = connector->dev;
+	struct drm_connector_state *state = connector->state;
+
+	WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
+	if (state->content_protection == val)
+		return;
+
+	state->content_protection = val;
+	drm_sysfs_connector_status_event(connector,
+				 dev->mode_config.content_protection_property);
+}
+EXPORT_SYMBOL(drm_hdcp_update_content_protection);
include/drm/drm_hdcp.h +2 -0
index 82447af98aa2..06a11202a097 100644
@@ -292,6 +292,8 @@ bool drm_hdcp_check_ksvs_revoked(struct drm_device *dev,
 				 u8 *ksvs, u32 ksv_count);
 int drm_connector_attach_content_protection_property(
 		struct drm_connector *connector, bool hdcp_content_type);
+void drm_hdcp_update_content_protection(struct drm_connector *connector,
+					u64 val);
 
 /* Content Type classification for HDCP2.2 vs others */
 #define DRM_MODE_HDCP_CONTENT_TYPE0		0
Signature · 6 lines
2.19.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw

PATCH v12 5/6 drm/i915: update the hdcp state with uevent

In reply to Ramalingam C

drm function to update the content protection property state and to generate a uevent is invoked from the intel hdcp property work.

Hence whenever kernel changes the property state, userspace will be updated with a uevent.

v2:
state update is moved into drm function [daniel]

---
 drivers/gpu/drm/i915/display/intel_hdcp.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/display/intel_hdcp.c +3 -5
index a52f6ef2951e..704dfbccf774 100644
@@ -870,7 +870,6 @@ static void intel_hdcp_prop_work(struct work_struct *work)
 					       prop_work);
 	struct intel_connector *connector = intel_hdcp_to_connector(hdcp);
 	struct drm_device *dev = connector->base.dev;
-	struct drm_connector_state *state;
 
 	drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
 	mutex_lock(&hdcp->mutex);
@@ -880,10 +879,9 @@ static void intel_hdcp_prop_work(struct work_struct *work)
 	 * those to UNDESIRED is handled by core. If value == UNDESIRED,
 	 * we're running just after hdcp has been disabled, so just exit
 	 */
-	if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {
-		state = connector->base.state;
-		state->content_protection = hdcp->value;
-	}
+	if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED)
+		drm_hdcp_update_content_protection(&connector->base,
+						   hdcp->value);
 
 	mutex_unlock(&hdcp->mutex);
 	drm_modeset_unlock(&dev->mode_config.connection_mutex);
Signature · 6 lines
2.19.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw

PATCH v12 6/6 drm/hdcp: reference for srm file format

In reply to Ramalingam C

In the kernel documentation, HDCP specifications links are shared as a reference for SRM table format.

v2:
Fixed small nits. [Shashank]

---
 drivers/gpu/drm/drm_hdcp.c | 7 +++++++
 1 file changed, 7 insertions(+)
drivers/gpu/drm/drm_hdcp.c +7 -0
index 77433ee3d652..9191633a3c43 100644
@@ -271,6 +271,13 @@ static void drm_hdcp_request_srm(struct drm_device *drm_dev)
  *
  * SRM should be presented in the name of "display_hdcp_srm.bin".
  *
+ * Format of the SRM table, that userspace needs to write into the binary file,
+ * is defined at:
+ * 1. Renewability chapter on 55th page of HDCP 1.4 specification
+ * https://www.digital-cp.com/sites/default/files/specifications/HDCP%20Specification%20Rev1_4_Secure.pdf
+ * 2. Renewability chapter on 63rd page of HDCP 2.2 specification
+ * https://www.digital-cp.com/sites/default/files/specifications/HDCP%20on%20HDMI%20Specification%20Rev2_2_Final1.pdf
+ *
  * Returns:
  * TRUE on any of the KSV is revoked, else FALSE.
  */
Signature · 6 lines
2.19.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#7 lore raw

✗ Fi.CI.CHECKPATCH: warning for HDCP2.2 Phase II (rev14)

In reply to Ramalingam C
== Series Details ==

== Series Details ==

Series: HDCP2.2 Phase II (rev14)
URL : https://patchwork.freedesktop.org/series/57232/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
ce79e1d0d5a1 drm: Add Content protection type property
-:146: CHECK:LINE_SPACING: Please use a blank line after function/struct/union/enum declarations
#146: FILE: drivers/gpu/drm/drm_hdcp.c:351:
+};
+DRM_ENUM_NAME_FN(drm_get_hdcp_content_type_name,

-:191: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #191: FILE: drivers/gpu/drm/drm_hdcp.c:404:
+ prop = drm_property_create_enum(dev, 0, "HDCP Content Type",
+ drm_hdcp_content_type_enum_list,

-:192: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #192: FILE: drivers/gpu/drm/drm_hdcp.c:405:
+ ARRAY_SIZE(

total: 0 errors, 0 warnings, 3 checks, 189 lines checked 5a8acad0bc86 drm/i915: Attach content type property add126230c60 drm: uevent for connector status change 3b164c38b461 drm/hdcp: update content protection property with uevent -:104: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #104: FILE: drivers/gpu/drm/drm_hdcp.c:448:
+ drm_sysfs_connector_status_event(connector,
+ dev->mode_config.content_protection_property);

total: 0 errors, 0 warnings, 1 checks, 74 lines checked f052ab943daa drm/i915: update the hdcp state with uevent 26394e4cc3b2 drm/hdcp: reference for srm file format

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#8 lore raw

✗ Fi.CI.BAT: failure for HDCP2.2 Phase II (rev14)

In reply to Ramalingam C
== Series Details ==

== Series Details ==

Series: HDCP2.2 Phase II (rev14)
URL : https://patchwork.freedesktop.org/series/57232/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_6605 -> Patchwork_13834
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_13834 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_13834, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_13834:

### IGT changes ###

#### Possible regressions ####

* igt@i915_module_load@reload-with-fault-injection:
- fi-skl-6770hq: [PASS][1] -> [DMESG-WARN][2] +2 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-skl-6770hq/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-skl-6770hq/igt@[email protected]

* {igt@kms_content_protection@srm} (NEW):
- fi-cfl-8109u: NOTRUN -> [FAIL][3]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-cfl-8109u/igt@[email protected]
- {fi-icl-u4}: NOTRUN -> [SKIP][4]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-icl-u4/igt@[email protected]
- fi-icl-dsi: NOTRUN -> [SKIP][5]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-icl-dsi/igt@[email protected]
- fi-skl-lmem: NOTRUN -> [FAIL][6]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-skl-lmem/igt@[email protected]
- fi-apl-guc: NOTRUN -> [FAIL][7]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-apl-guc/igt@[email protected]
- fi-icl-u3: NOTRUN -> [FAIL][8]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-icl-u3/igt@[email protected]
- fi-cml-u2: NOTRUN -> [SKIP][9]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-cml-u2/igt@[email protected]

New tests
---------

New tests have been introduced between CI_DRM_6605 and Patchwork_13834:

### New IGT tests (1) ###

* igt@kms_content_protection@srm:
- Statuses : 4 fail(s) 5 pass(s) 34 skip(s)
- Exec time: [0.0, 130.44] s

Known issues
------------

Here are the changes found in Patchwork_13834 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@kms_addfb_basic@size-max:
- fi-icl-u3: [PASS][10] -> [DMESG-WARN][11] ([fdo#107724])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-icl-u3/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-icl-u3/igt@[email protected]

* igt@kms_chamelium@dp-hpd-fast:
- fi-kbl-7500u: [PASS][12] -> [DMESG-WARN][13] ([fdo#103558] / [fdo#105602])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-kbl-7500u/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-kbl-7500u/igt@[email protected]

* igt@kms_flip@basic-flip-vs-dpms:
- fi-skl-6770hq: [PASS][14] -> [SKIP][15] ([fdo#109271]) +23 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-skl-6770hq/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-skl-6770hq/igt@[email protected]

* igt@prime_vgem@basic-fence-mmap:
- fi-elk-e7500: [PASS][16] -> [INCOMPLETE][17] ([fdo#103989] / [fdo#111276])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-elk-e7500/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-elk-e7500/igt@[email protected]

* igt@prime_vgem@basic-fence-read:
- fi-bsw-kefka: [PASS][18] -> [INCOMPLETE][19] ([fdo#111278])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-bsw-kefka/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-bsw-kefka/igt@[email protected]

#### Possible fixes ####

* igt@i915_module_load@reload:
- fi-icl-u3: [DMESG-WARN][20] ([fdo#107724]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-icl-u3/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-icl-u3/igt@[email protected]

* igt@i915_selftest@live_execlists:
- fi-skl-gvtdvm: [DMESG-FAIL][22] ([fdo#111108]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html

* igt@kms_busy@basic-flip-a:
- fi-kbl-7567u: [SKIP][24] ([fdo#109271] / [fdo#109278]) -> [PASS][25] +2 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-kbl-7567u/igt@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-kbl-7567u/igt@[email protected]

* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][26] ([fdo#109485]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-kbl-7500u/igt@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-kbl-7500u/igt@[email protected]

* igt@prime_vgem@basic-busy-default:
- fi-bxt-j4205: [FAIL][28] ([fdo#111277]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-bxt-j4205/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-bxt-j4205/igt@[email protected]

* igt@prime_vgem@basic-fence-mmap:
- fi-pnv-d510: [INCOMPLETE][30] ([fdo#110740] / [fdo#111276]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-pnv-d510/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-pnv-d510/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#103558]: https://bugs.freedesktop.org/show_bug.cgi?id=103558
[fdo#103989]: https://bugs.freedesktop.org/show_bug.cgi?id=103989
[fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
[fdo#110740]: https://bugs.freedesktop.org/show_bug.cgi?id=110740
[fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[fdo#111108]: https://bugs.freedesktop.org/show_bug.cgi?id=111108
[fdo#111276]: https://bugs.freedesktop.org/show_bug.cgi?id=111276
[fdo#111277]: https://bugs.freedesktop.org/show_bug.cgi?id=111277
[fdo#111278]: https://bugs.freedesktop.org/show_bug.cgi?id=111278

Participating hosts (47 -> 44)
------------------------------

Additional (2): fi-icl-dsi fi-apl-guc
Missing (5): fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus

Build changes
-------------

* CI: CI-20190529 -> None
* IGT: IGT_5120 -> IGTPW_3263
* Linux: CI_DRM_6605 -> Patchwork_13834

CI-20190529: 20190529
CI_DRM_6605: 09970f7b8f1336416254cfac87f196578e3c1d13 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_3263: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3263/
IGT_5120: b3138fbea79d5d7935e53530b90efe3e816236f4 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13834: 26394e4cc3b27ba4aecaab2bff93fd036a2c3f91 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

26394e4cc3b2 drm/hdcp: reference for srm file format f052ab943daa drm/i915: update the hdcp state with uevent 3b164c38b461 drm/hdcp: update content protection property with uevent add126230c60 drm: uevent for connector status change 5a8acad0bc86 drm/i915: Attach content type property ce79e1d0d5a1 drm: Add Content protection type property

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#9 lore raw

Re: ✗ Fi.CI.BAT: failure for HDCP2.2 Phase II (rev14)

Quoted 29 lines · Patchwork

== Series Details ==

Series: HDCP2.2 Phase II (rev14)
URL : https://patchwork.freedesktop.org/series/57232/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_6605 -> Patchwork_13834
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_13834 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_13834, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/

Possible new issues
-------------------

Quoted 5 lines

Here are the unknown changes that may have been introduced in Patchwork_13834:

### IGT changes ###

#### Possible regressions ####

Martin,

There is no regression in this test result. Known skips and expected failures due to hdcp sinks are observed on the new HDCP test called "SRM".

I have provided the reasoning for each observations below. With these filters in CI results supposed to be GREEN.

How should we proceed here further? Thanks.

Quoted 5 lines

* igt@i915_module_load@reload-with-fault-injection:
- fi-skl-6770hq: [PASS][1] -> [DMESG-WARN][2] +2 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-skl-6770hq/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-skl-6770hq/igt@[email protected]

These dmesg warnings are caused due to the DP aux transfer failures. [drm:intel_dp_aux_xfer [i915]] dp_aux_ch timeout status 0x7d4003ff

Quoted 2 lines

* {igt@kms_content_protection@srm} (NEW):

SRM test is newly added at
https://patchwork.freedesktop.org/series/57756/ and used here to test.

Quoted 2 lines

- fi-cfl-8109u: NOTRUN -> [FAIL][3]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-cfl-8109u/igt@[email protected]

Failed due to the known HDCP error on LspCON
<7> [388.944041] [drm:intel_hdcp_auth [i915]] KSV list failed to become ready (-110)

Quoted 4 lines

- {fi-icl-u4}: NOTRUN -> [SKIP][4]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-icl-u4/igt@[email protected]
- fi-icl-dsi: NOTRUN -> [SKIP][5]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-icl-dsi/igt@[email protected]

Above two tests are expected to skip as No connector found with HDCP capability.

Quoted 4 lines

- fi-skl-lmem: NOTRUN -> [FAIL][6]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-skl-lmem/igt@[email protected]
- fi-apl-guc: NOTRUN -> [FAIL][7]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-apl-guc/igt@[email protected]

Above two tests expected failed due to the known HDCP error on LspCON <7> [459.700324] [drm:intel_hdcp_auth [i915]] KSV list failed to become ready (-110)

Quoted 2 lines

- fi-icl-u3: NOTRUN -> [FAIL][8]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-icl-u3/igt@[email protected]

Failed due to invalid BKSV. Hence expected behaviour on this sink. <7> [296.873715] [drm:intel_hdcp_read_valid_bksv.isra.1 [i915]] Bksv is invalid

Quoted 2 lines

- fi-cml-u2: NOTRUN -> [SKIP][9]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-cml-u2/igt@[email protected]

Test expected to skip as No connector found with HDCP capability.

-Ram

Quoted 132 lines

New tests
---------

New tests have been introduced between CI_DRM_6605 and Patchwork_13834:

### New IGT tests (1) ###

* igt@kms_content_protection@srm:
- Statuses : 4 fail(s) 5 pass(s) 34 skip(s)
- Exec time: [0.0, 130.44] s

Known issues
------------

Here are the changes found in Patchwork_13834 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@kms_addfb_basic@size-max:
- fi-icl-u3: [PASS][10] -> [DMESG-WARN][11] ([fdo#107724])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-icl-u3/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-icl-u3/igt@[email protected]

* igt@kms_chamelium@dp-hpd-fast:
- fi-kbl-7500u: [PASS][12] -> [DMESG-WARN][13] ([fdo#103558] / [fdo#105602])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-kbl-7500u/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-kbl-7500u/igt@[email protected]

* igt@kms_flip@basic-flip-vs-dpms:
- fi-skl-6770hq: [PASS][14] -> [SKIP][15] ([fdo#109271]) +23 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-skl-6770hq/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-skl-6770hq/igt@[email protected]

* igt@prime_vgem@basic-fence-mmap:
- fi-elk-e7500: [PASS][16] -> [INCOMPLETE][17] ([fdo#103989] / [fdo#111276])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-elk-e7500/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-elk-e7500/igt@[email protected]

* igt@prime_vgem@basic-fence-read:
- fi-bsw-kefka: [PASS][18] -> [INCOMPLETE][19] ([fdo#111278])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-bsw-kefka/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-bsw-kefka/igt@[email protected]

#### Possible fixes ####

* igt@i915_module_load@reload:
- fi-icl-u3: [DMESG-WARN][20] ([fdo#107724]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-icl-u3/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-icl-u3/igt@[email protected]

* igt@i915_selftest@live_execlists:
- fi-skl-gvtdvm: [DMESG-FAIL][22] ([fdo#111108]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html

* igt@kms_busy@basic-flip-a:
- fi-kbl-7567u: [SKIP][24] ([fdo#109271] / [fdo#109278]) -> [PASS][25] +2 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-kbl-7567u/igt@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-kbl-7567u/igt@[email protected]

* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][26] ([fdo#109485]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-kbl-7500u/igt@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-kbl-7500u/igt@[email protected]

* igt@prime_vgem@basic-busy-default:
- fi-bxt-j4205: [FAIL][28] ([fdo#111277]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-bxt-j4205/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-bxt-j4205/igt@[email protected]

* igt@prime_vgem@basic-fence-mmap:
- fi-pnv-d510: [INCOMPLETE][30] ([fdo#110740] / [fdo#111276]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-pnv-d510/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-pnv-d510/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#103558]: https://bugs.freedesktop.org/show_bug.cgi?id=103558
[fdo#103989]: https://bugs.freedesktop.org/show_bug.cgi?id=103989
[fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
[fdo#110740]: https://bugs.freedesktop.org/show_bug.cgi?id=110740
[fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[fdo#111108]: https://bugs.freedesktop.org/show_bug.cgi?id=111108
[fdo#111276]: https://bugs.freedesktop.org/show_bug.cgi?id=111276
[fdo#111277]: https://bugs.freedesktop.org/show_bug.cgi?id=111277
[fdo#111278]: https://bugs.freedesktop.org/show_bug.cgi?id=111278

Participating hosts (47 -> 44)
------------------------------

Additional (2): fi-icl-dsi fi-apl-guc
Missing (5): fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus

Build changes
-------------

* CI: CI-20190529 -> None
* IGT: IGT_5120 -> IGTPW_3263
* Linux: CI_DRM_6605 -> Patchwork_13834

CI-20190529: 20190529
CI_DRM_6605: 09970f7b8f1336416254cfac87f196578e3c1d13 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_3263: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3263/
IGT_5120: b3138fbea79d5d7935e53530b90efe3e816236f4 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13834: 26394e4cc3b27ba4aecaab2bff93fd036a2c3f91 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

26394e4cc3b2 drm/hdcp: reference for srm file format f052ab943daa drm/i915: update the hdcp state with uevent 3b164c38b461 drm/hdcp: update content protection property with uevent add126230c60 drm: uevent for connector status change 5a8acad0bc86 drm/i915: Attach content type property ce79e1d0d5a1 drm: Add Content protection type property

Quoted 3 lines

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#10 lore raw

Re: ✗ Fi.CI.BAT: failure for HDCP2.2 Phase II (rev14)

Hi,

Sorry for the delay, I was on vacation. The machine fi-skl-6770hq was not marked as having an LSPCON. This is now done, and this means that this issue should be covered by ab existing bug.

I queued another run, and we'll see if it gives us a green (new tests don't need to pass on all machines).

Martin

Quoted 74 lines · Ramalingam C
Quoted 29 lines · Patchwork

== Series Details ==

Series: HDCP2.2 Phase II (rev14)
URL : https://patchwork.freedesktop.org/series/57232/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_6605 -> Patchwork_13834
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_13834 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_13834, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/

Possible new issues
-------------------

Quoted 5 lines

Here are the unknown changes that may have been introduced in Patchwork_13834:

### IGT changes ###

#### Possible regressions ####

Martin,

There is no regression in this test result. Known skips and expected failures due to hdcp sinks are observed on the new HDCP test called "SRM".

I have provided the reasoning for each observations below. With these filters in CI results supposed to be GREEN.

How should we proceed here further? Thanks.

Quoted 5 lines

* igt@i915_module_load@reload-with-fault-injection:
- fi-skl-6770hq: [PASS][1] -> [DMESG-WARN][2] +2 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-skl-6770hq/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-skl-6770hq/igt@[email protected]

These dmesg warnings are caused due to the DP aux transfer failures. [drm:intel_dp_aux_xfer [i915]] dp_aux_ch timeout status 0x7d4003ff

Quoted 2 lines

* {igt@kms_content_protection@srm} (NEW):

SRM test is newly added at
https://patchwork.freedesktop.org/series/57756/ and used here to test.

Quoted 2 lines

- fi-cfl-8109u: NOTRUN -> [FAIL][3]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-cfl-8109u/igt@[email protected]

Failed due to the known HDCP error on LspCON
<7> [388.944041] [drm:intel_hdcp_auth [i915]] KSV list failed to become ready (-110)

Quoted 4 lines

- {fi-icl-u4}: NOTRUN -> [SKIP][4]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-icl-u4/igt@[email protected]
- fi-icl-dsi: NOTRUN -> [SKIP][5]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-icl-dsi/igt@[email protected]

Above two tests are expected to skip as No connector found with HDCP capability.

Quoted 4 lines

- fi-skl-lmem: NOTRUN -> [FAIL][6]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-skl-lmem/igt@[email protected]
- fi-apl-guc: NOTRUN -> [FAIL][7]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-apl-guc/igt@[email protected]

Above two tests expected failed due to the known HDCP error on LspCON <7> [459.700324] [drm:intel_hdcp_auth [i915]] KSV list failed to become ready (-110)

Quoted 2 lines

- fi-icl-u3: NOTRUN -> [FAIL][8]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-icl-u3/igt@[email protected]

Quoted 142 lines

Failed due to invalid BKSV. Hence expected behaviour on this sink. <7> [296.873715] [drm:intel_hdcp_read_valid_bksv.isra.1 [i915]] Bksv is invalid

Quoted 2 lines

- fi-cml-u2: NOTRUN -> [SKIP][9]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-cml-u2/igt@[email protected]

Test expected to skip as No connector found with HDCP capability.

-Ram

Quoted 135 lines

New tests
---------

New tests have been introduced between CI_DRM_6605 and Patchwork_13834:

### New IGT tests (1) ###

* igt@kms_content_protection@srm:
- Statuses : 4 fail(s) 5 pass(s) 34 skip(s)
- Exec time: [0.0, 130.44] s

Known issues
------------

Here are the changes found in Patchwork_13834 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@kms_addfb_basic@size-max:
- fi-icl-u3: [PASS][10] -> [DMESG-WARN][11] ([fdo#107724])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-icl-u3/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-icl-u3/igt@[email protected]

* igt@kms_chamelium@dp-hpd-fast:
- fi-kbl-7500u: [PASS][12] -> [DMESG-WARN][13] ([fdo#103558] / [fdo#105602])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-kbl-7500u/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-kbl-7500u/igt@[email protected]

* igt@kms_flip@basic-flip-vs-dpms:
- fi-skl-6770hq: [PASS][14] -> [SKIP][15] ([fdo#109271]) +23 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-skl-6770hq/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-skl-6770hq/igt@[email protected]

* igt@prime_vgem@basic-fence-mmap:
- fi-elk-e7500: [PASS][16] -> [INCOMPLETE][17] ([fdo#103989] / [fdo#111276])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-elk-e7500/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-elk-e7500/igt@[email protected]

* igt@prime_vgem@basic-fence-read:
- fi-bsw-kefka: [PASS][18] -> [INCOMPLETE][19] ([fdo#111278])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-bsw-kefka/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-bsw-kefka/igt@[email protected]

#### Possible fixes ####

* igt@i915_module_load@reload:
- fi-icl-u3: [DMESG-WARN][20] ([fdo#107724]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-icl-u3/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-icl-u3/igt@[email protected]

* igt@i915_selftest@live_execlists:
- fi-skl-gvtdvm: [DMESG-FAIL][22] ([fdo#111108]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html

* igt@kms_busy@basic-flip-a:
- fi-kbl-7567u: [SKIP][24] ([fdo#109271] / [fdo#109278]) -> [PASS][25] +2 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-kbl-7567u/igt@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-kbl-7567u/igt@[email protected]

* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][26] ([fdo#109485]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-kbl-7500u/igt@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-kbl-7500u/igt@[email protected]

* igt@prime_vgem@basic-busy-default:
- fi-bxt-j4205: [FAIL][28] ([fdo#111277]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-bxt-j4205/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-bxt-j4205/igt@[email protected]

* igt@prime_vgem@basic-fence-mmap:
- fi-pnv-d510: [INCOMPLETE][30] ([fdo#110740] / [fdo#111276]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6605/fi-pnv-d510/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/fi-pnv-d510/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#103558]: https://bugs.freedesktop.org/show_bug.cgi?id=103558
[fdo#103989]: https://bugs.freedesktop.org/show_bug.cgi?id=103989
[fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
[fdo#110740]: https://bugs.freedesktop.org/show_bug.cgi?id=110740
[fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[fdo#111108]: https://bugs.freedesktop.org/show_bug.cgi?id=111108
[fdo#111276]: https://bugs.freedesktop.org/show_bug.cgi?id=111276
[fdo#111277]: https://bugs.freedesktop.org/show_bug.cgi?id=111277
[fdo#111278]: https://bugs.freedesktop.org/show_bug.cgi?id=111278

Participating hosts (47 -> 44)
------------------------------

Additional (2): fi-icl-dsi fi-apl-guc
Missing (5): fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus

Build changes
-------------

* CI: CI-20190529 -> None
* IGT: IGT_5120 -> IGTPW_3263
* Linux: CI_DRM_6605 -> Patchwork_13834

CI-20190529: 20190529
CI_DRM_6605: 09970f7b8f1336416254cfac87f196578e3c1d13 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_3263: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3263/
IGT_5120: b3138fbea79d5d7935e53530b90efe3e816236f4 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13834: 26394e4cc3b27ba4aecaab2bff93fd036a2c3f91 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

26394e4cc3b2 drm/hdcp: reference for srm file format f052ab943daa drm/i915: update the hdcp state with uevent 3b164c38b461 drm/hdcp: update content protection property with uevent add126230c60 drm: uevent for connector status change 5a8acad0bc86 drm/i915: Attach content type property ce79e1d0d5a1 drm: Add Content protection type property

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13834/

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Acked-by on the v12 series
#11 lore raw
In reply to Ramalingam C
Quoted 2 lines · Ramalingam C

Series adds the content_type support for HDCP2.2. Along with that uevent is sent for each HDCP state change triggered within kernel.

For merging the i915 specific parts via drm-misc along the rest of the patches.

Quoted 34 lines

Pekka have completed the Weston DRM-backend review in
https://gitlab.freedesktop.org/wayland/weston/merge_requests/48
and the UAPI for HDCP 2.2 looks good.

The userspace is accepted in Weston.

v12:
DRM_MODE_HDCP_CONTENT_TYPEx definition are moved into drm_hdcp.h
[pekka]
Picked Acked-by and R-by from reviewers.

Test-with: <[email protected]>

Ramalingam C (6):
drm: Add Content protection type property drm/i915: Attach content type property
drm: uevent for connector status change drm/hdcp: update content protection property with uevent drm/i915: update the hdcp state with uevent drm/hdcp: reference for srm file format

 drivers/gpu/drm/drm_atomic_uapi.c         |  4 ++
 drivers/gpu/drm/drm_connector.c           | 68 ++++++++++++++++++--
 drivers/gpu/drm/drm_hdcp.c                | 77 ++++++++++++++++++++++-
 drivers/gpu/drm/drm_sysfs.c               | 35 +++++++++++
 drivers/gpu/drm/i915/display/intel_ddi.c  | 39 ++++++++++--
 drivers/gpu/drm/i915/display/intel_hdcp.c | 53 ++++++++++------
 drivers/gpu/drm/i915/display/intel_hdcp.h |  2 +-
 include/drm/drm_connector.h               |  7 +++
 include/drm/drm_hdcp.h                    |  9 ++-
 include/drm/drm_mode_config.h             |  6 ++
 include/drm/drm_sysfs.h                   |  5 +-
 11 files changed, 271 insertions(+), 34 deletions(-)
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#12 lore raw
In reply to Ramalingam C
Quoted 7 lines · Ramalingam C

Series adds the content_type support for HDCP2.2. Along with that uevent is sent for each HDCP state change triggered within kernel.

Pekka have completed the Weston DRM-backend review in
https://gitlab.freedesktop.org/wayland/weston/merge_requests/48
and the UAPI for HDCP 2.2 looks good.

Quoted 6 lines

The userspace is accepted in Weston.

v12:
DRM_MODE_HDCP_CONTENT_TYPEx definition are moved into drm_hdcp.h
[pekka]
Picked Acked-by and R-by from reviewers.

Merged this series into drm-misc-next. Thanks for the reviewes!

BR,
-Ram.

Quoted 11 lines

Test-with: <[email protected]>

Ramalingam C (6):
drm: Add Content protection type property drm/i915: Attach content type property
drm: uevent for connector status change drm/hdcp: update content protection property with uevent drm/i915: update the hdcp state with uevent drm/hdcp: reference for srm file format

Quoted 16 lines
 drivers/gpu/drm/drm_atomic_uapi.c         |  4 ++
 drivers/gpu/drm/drm_connector.c           | 68 ++++++++++++++++++--
 drivers/gpu/drm/drm_hdcp.c                | 77 ++++++++++++++++++++++-
 drivers/gpu/drm/drm_sysfs.c               | 35 +++++++++++
 drivers/gpu/drm/i915/display/intel_ddi.c  | 39 ++++++++++--
 drivers/gpu/drm/i915/display/intel_hdcp.c | 53 ++++++++++------
 drivers/gpu/drm/i915/display/intel_hdcp.h |  2 +-
 include/drm/drm_connector.h               |  7 +++
 include/drm/drm_hdcp.h                    |  9 ++-
 include/drm/drm_mode_config.h             |  6 ++
 include/drm/drm_sysfs.h                   |  5 +-
 11 files changed, 271 insertions(+), 34 deletions(-)
Signature · 1 line
2.19.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#13 lore raw

✗ Fi.CI.BAT: failure for HDCP2.2 Phase II (rev15)

In reply to Ramalingam C
== Series Details ==

== Series Details ==

Series: HDCP2.2 Phase II (rev15)
URL : https://patchwork.freedesktop.org/series/57232/
State : failure

== Summary ==

Applying: drm: Add Content protection type property
Using index info to reconstruct a base tree...
M drivers/gpu/drm/drm_atomic_uapi.c
M drivers/gpu/drm/drm_connector.c
M drivers/gpu/drm/drm_hdcp.c
M drivers/gpu/drm/i915/display/intel_hdcp.c
M include/drm/drm_connector.h
M include/drm/drm_hdcp.h
M include/drm/drm_mode_config.h
Falling back to patching base and 3-way merge...
Auto-merging include/drm/drm_hdcp.h
CONFLICT (content): Merge conflict in include/drm/drm_hdcp.h Auto-merging include/drm/drm_connector.h
Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_hdcp.c Auto-merging drivers/gpu/drm/drm_hdcp.c
Auto-merging drivers/gpu/drm/drm_connector.c
Auto-merging drivers/gpu/drm/drm_atomic_uapi.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 drm: Add Content protection type property When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx