drm/hdcp: update content protection property with uevent

[sfrench/cifs-2.6.git] / drivers / gpu / drm / drm_hdcp.c

diff --git a/drivers/gpu/drm/drm_hdcp.c b/drivers/gpu/drm/drm_hdcp.c
index cd837bd409f730483519728d54517079663b298b..77433ee3d6521f07aa3c8a4617981c4e1426757e 100644 (file)
--- a/drivers/gpu/drm/drm_hdcp.c
+++ b/drivers/gpu/drm/drm_hdcp.c
@@ -344,23 +344,45 @@ 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
  *
+ * 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.
  */
 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 +399,52 @@ 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);
+
+/**
+ * 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);