Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Ramalingam C <ramalingam.c@intel.com>
To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
	daniel.vetter@intel.com
Cc: Ramalingam C <ramalingam.c@intel.com>, uma.shankar@intel.com
Subject: [RFC v1 12/20] drm/hdcp: Atomic set and get property for hdcp
Date: Wed, 12 Jul 2017 13:58:56 +0530	[thread overview]
Message-ID: <1499848144-8456-13-git-send-email-ramalingam.c@intel.com> (raw)
In-Reply-To: <1499848144-8456-1-git-send-email-ramalingam.c@intel.com>

Atomic ioctl request is pruned based on the platform
and panel's HDCP capabilities along with current state of HDCP
protection on the connector.

Valid enable and disable requests are passed on to the
HDCP stack.

get_property also updated with current state of the HDCP on
connector.

Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
---
 drivers/gpu/drm/drm_atomic.c |  5 +++++
 drivers/gpu/drm/drm_hdcp.c   | 53 ++++++++++++++++++++++++++++++++++++++++++++
 include/drm/drm_hdcp.h       |  1 +
 3 files changed, 59 insertions(+)

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 09ca662..9d4af3b 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -30,6 +30,7 @@
 #include <drm/drm_atomic.h>
 #include <drm/drm_mode.h>
 #include <drm/drm_print.h>
+#include <drm/drm_hdcp.h>
 #include <linux/sync_file.h>
 
 #include "drm_crtc_internal.h"
@@ -1188,6 +1189,8 @@ int drm_atomic_connector_set_property(struct drm_connector *connector,
 		 */
 		if (state->link_status != DRM_LINK_STATUS_GOOD)
 			state->link_status = val;
+	} else if (property == config->hdcp_property) {
+		return drm_hdcp_set_property(connector, val);
 	} else if (property == config->aspect_ratio_property) {
 		state->picture_aspect_ratio = val;
 	} else if (property == connector->scaling_mode_property) {
@@ -1268,6 +1271,8 @@ drm_atomic_connector_get_property(struct drm_connector *connector,
 		*val = state->tv.hue;
 	} else if (property == config->link_status_property) {
 		*val = state->link_status;
+	} else if (property == config->hdcp_property) {
+		*val = connector->hdcp_state;
 	} else if (property == config->aspect_ratio_property) {
 		*val = state->picture_aspect_ratio;
 	} else if (property == connector->scaling_mode_property) {
diff --git a/drivers/gpu/drm/drm_hdcp.c b/drivers/gpu/drm/drm_hdcp.c
index 89c7c5e..9b3bf92 100644
--- a/drivers/gpu/drm/drm_hdcp.c
+++ b/drivers/gpu/drm/drm_hdcp.c
@@ -69,6 +69,59 @@ int drm_hdcp_disable(struct drm_connector *connector)
 	return 0;
 }
 
+
+/**
+ * @drm_hdcp_set_property:
+ *
+ * Entry function for hdcp_enable and hdcp_disable.
+ */
+int drm_hdcp_set_property(struct drm_connector *connector,
+						uint64_t req_state)
+{
+	struct drm_hdcp *hdcp = connector->hdcp;
+	uint64_t cur_state = connector->hdcp_state;
+	uint8_t stream_type;
+
+	if (connector->status != connector_status_connected)
+		return -EINVAL;
+
+	if (!hdcp)
+		return -EINVAL;
+
+	DRM_DEBUG("Prop_val: Current : 0x%llx, Request: 0x%llx\n",
+						cur_state, req_state);
+
+	if (!(cur_state & DRM_HDCP_VER_SUPPORT_MASK)) {
+		DRM_ERROR("None of the HDCP Ver is supported\n");
+		return -EINVAL;
+	}
+
+	if ((cur_state & DRM_HDCP_ENABLE) ==
+				(req_state & DRM_HDCP_ENABLE)) {
+		DRM_DEBUG("Req for current state is redundant\n");
+		return -EINVAL;
+	}
+
+	if (!(cur_state & DRM_HDCP2_SUPPORTED) &&
+				req_state & DRM_HDCP_TYPE_BIT0) {
+		DRM_ERROR("Type 1 HDCP is not available\n");
+		return -EINVAL;
+	}
+
+	if (cur_state & DRM_HDCP_WIP)
+		return -EBUSY;
+
+	if (req_state & DRM_HDCP_ENABLE) {
+		stream_type = (req_state & DRM_HDCP_TYPE_MASK) >>
+					DRM_HDCP_TYPE_SHIFT;
+		return drm_hdcp_enable(connector, stream_type);
+	} else {
+		drm_hdcp_disable(connector);
+	}
+
+	return 0;
+}
+
 void drm_hdcp_late_init(struct drm_connector *connector)
 {
 	struct drm_hdcp *hdcp = connector->hdcp;
diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h
index 89879ff..eb7149b 100644
--- a/include/drm/drm_hdcp.h
+++ b/include/drm/drm_hdcp.h
@@ -169,5 +169,6 @@ extern int drm_hdcp_init(struct drm_connector *connector,
 					uint8_t spec_supported);
 extern void drm_hdcp_connector_state_change_handler(
 				struct drm_connector *connector);
+int drm_hdcp_set_property(struct drm_connector *connector, uint64_t val);
 
 #endif	/* __DRM_HDCP_H__ */
-- 
2.7.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2017-07-12  8:28 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-12  8:28 [RFC v1 00/20] DRM Interfaces for HDCP support Ramalingam C
2017-07-12  8:28 ` [RFC v1 01/20] drm/hdcp: HDCP bitmask property for connectors Ramalingam C
2017-07-12  9:54   ` Daniel Vetter
2017-07-12 14:56     ` [Intel-gfx] " Ramalingam C
2017-07-12 19:10       ` Sean Paul
2017-07-13  6:09         ` Daniel Vetter
2017-07-13  6:54           ` Ramalingam C
2017-07-13  8:45             ` Daniel Vetter
2017-07-13 10:15               ` [Intel-gfx] " Ramalingam C
2017-07-13 10:36                 ` Daniel Vetter
2017-07-13 12:59                   ` Ramalingam C
2017-07-13 19:02                     ` [Intel-gfx] " Daniel Vetter
2017-07-14 10:40                       ` Ramalingam C
2017-07-14 11:21                         ` [RFC v2] drm/hdcp: drm enum property for HDCP State Ramalingam C
2017-07-14 13:55                           ` Sean Paul
2017-07-21 13:02                             ` Ramalingam C
2017-07-24 13:23                               ` Sean Paul
2017-07-24 13:34                                 ` Ramalingam C
2017-07-24 18:12                                 ` [RFC v3] drm/hdcp: drm enum property for CP State Ramalingam C
2017-07-25 12:34                                   ` Sean Paul
2017-07-26  9:54                                     ` Ramalingam C
2017-07-26 14:52                                       ` Sean Paul
2017-07-26 16:51                                         ` C, Ramalingam
2017-07-26 17:54                                           ` Sean Paul
2017-08-02 15:32                                             ` Ramalingam C
2017-08-02 15:53                                               ` [RFC v4] " Ramalingam C
2017-08-05 15:51                                                 ` Ramalingam C
2017-08-07  5:32                                                   ` Ramalingam C
2017-07-13  6:36         ` [Intel-gfx] [RFC v1 01/20] drm/hdcp: HDCP bitmask property for connectors Ramalingam C
2017-07-12  8:28 ` [RFC v1 02/20] drm/hdcp: HDCP SRM blob " Ramalingam C
2017-07-12  8:28 ` [RFC v1 03/20] drm/sysfs: Generate drm uevent with custom string Ramalingam C
2017-07-12  8:28 ` [RFC v1 04/20] drm/hdcp: Struct drm_hdcp for connector's hdcp state Ramalingam C
2017-07-12  8:28 ` [RFC v1 05/20] drm/hdcp: HDCP status code for DRM HDCP stack Ramalingam C
2017-07-12  8:28 ` [RFC v1 06/20] drm/hdcp: display driver callback funcs defined Ramalingam C
2017-07-12  8:28 ` [RFC v1 07/20] drm/hdcp: Initialization of DRM hdcp stack Ramalingam C
2017-07-12  8:28 ` [RFC v1 08/20] drm/hdcp: Add KBuild for DRM HDCP support Ramalingam C
2017-07-12  8:28 ` [RFC v1 09/20] drm/hdcp: Generic enable, disable and late_init Ramalingam C
2017-07-12  8:28 ` [RFC v1 10/20] drm/hdcp: Handler for connector state change Ramalingam C
2017-07-12  8:28 ` [RFC v1 11/20] drm/hdcp: Registering " Ramalingam C
2017-07-12  8:28 ` Ramalingam C [this message]
2017-07-12  8:28 ` [RFC v1 13/20] drm/hdcp: Updating DRM Property val with HDCP state Ramalingam C
2017-07-12  8:28 ` [RFC v1 14/20] drm/hdcp2.2: HDCP2.2 protocol msg definitions Ramalingam C
2017-07-12  8:28 ` [RFC v1 15/20] drm/hdcp2.2: Display driver service functions Ramalingam C
2017-07-12  8:29 ` [RFC v1 16/20] drm/hdcp2.2: HDCP2.2 Initialization Ramalingam C
2017-07-12  8:29 ` [RFC v1 17/20] drm/hdcp2.2: Definitions of HDMI HDCP2.2 registers Ramalingam C
2017-07-12  8:29 ` [RFC v1 18/20] drm/hdcp2.2: Late_init: Capability probing on panel Ramalingam C
2017-07-12  8:29 ` [RFC v1 19/20] drm/hdcp2.2: HDCP2.2 enable as a asynchronous work Ramalingam C
2017-07-12  8:29 ` [RFC v1 20/20] drm/hdcp2.2: HDCP2.2 disable " Ramalingam C
2017-07-12  8:35 ` ✗ Fi.CI.BAT: failure for DRM Interfaces for HDCP support Patchwork
2017-07-14 11:26 ` ✗ Fi.CI.BAT: failure for DRM Interfaces for HDCP support (rev2) Patchwork

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=1499848144-8456-13-git-send-email-ramalingam.c@intel.com \
    --to=ramalingam.c@intel.com \
    --cc=daniel.vetter@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=uma.shankar@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