Implements drm blob property cp_downstream_info property on HDCP
capable connectors.
Downstream topology info is gathered across authentication stages
and stored in intel_hdcp. When HDCP authentication is complete,
new blob with latest downstream topology information is updated to
cp_downstream_info property.
Signed-off-by: Ramalingam C <ramalingam.c@xxxxxxxxx>
---
drivers/gpu/drm/i915/intel_drv.h | 2 ++
drivers/gpu/drm/i915/intel_hdcp.c | 32 +++++++++++++++++++++++++++++++-
include/drm/drm_hdcp.h | 1 +
include/uapi/drm/drm_mode.h | 5 +++++
4 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 53a463d40f43..c7ef7e71439d 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -487,6 +487,8 @@ struct intel_hdcp {
unsigned int revocated_ksv_cnt;
u8 *revocated_ksv_list;
u32 srm_blob_id;
+
+ struct cp_downstream_info *downstream_info;
};
struct intel_connector {
diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c
index b92fc0383788..9ce634e552c1 100644
--- a/drivers/gpu/drm/i915/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/intel_hdcp.c
@@ -563,6 +563,9 @@ int intel_hdcp_auth_downstream(struct intel_hdcp *hdcp,
if (num_downstream == 0)
return -EINVAL;
+ hdcp->downstream_info->device_count = num_downstream;
+ hdcp->downstream_info->depth = DRM_HDCP_DEPTH(bstatus[1]);
+
ksv_fifo = kcalloc(DRM_HDCP_KSV_LEN, num_downstream, GFP_KERNEL);
if (!ksv_fifo)
return -ENOMEM;
@@ -576,6 +579,8 @@ int intel_hdcp_auth_downstream(struct intel_hdcp *hdcp,
return -EPERM;
}
+ memcpy(hdcp->downstream_info->ksv_list, ksv_fifo,
+ num_downstream * DRM_HDCP_KSV_LEN);
/*
* When V prime mismatches, DP Spec mandates re-read of
* V prime atleast twice.
@@ -677,15 +682,20 @@ static int intel_hdcp_auth(struct intel_connector *connector)
return -EPERM;
}
+ hdcp->downstream_info->ver_in_force = DRM_MODE_HDCP14_IN_FORCE;
+ memcpy(hdcp->downstream_info->bksv, bksv.shim, DRM_MODE_HDCP_KSV_LEN);
+
I915_WRITE(PORT_HDCP_BKSVLO(port), bksv.reg[0]);
I915_WRITE(PORT_HDCP_BKSVHI(port), bksv.reg[1]);
ret = shim->repeater_present(intel_dig_port, &repeater_present);
if (ret)
return ret;
- if (repeater_present)
+ if (repeater_present) {
I915_WRITE(HDCP_REP_CTL,
intel_hdcp_get_repeater_ctl(intel_dig_port));
+ hdcp->downstream_info->is_repeater = true;
+ }
ret = shim->toggle_signalling(intel_dig_port, true);
if (ret)
@@ -781,6 +791,13 @@ static int _intel_hdcp_disable(struct intel_connector *connector)
return ret;
}
+ memset(hdcp->downstream_info, 0, sizeof(struct cp_downstream_info));
+
+ if (drm_mode_connector_update_cp_downstream_property(
+ &connector->base,
+ connector->hdcp.downstream_info))
+ DRM_ERROR("Downstream_info update failed.\n");
+
DRM_DEBUG_KMS("HDCP is disabled\n");
return 0;
}
@@ -814,6 +831,10 @@ static int _intel_hdcp_enable(struct intel_connector *connector)
ret = intel_hdcp_auth(connector);
if (!ret) {
connector->hdcp.hdcp_encrypted = true;
+ if (drm_mode_connector_update_cp_downstream_property(
+ &connector->base,
+ connector->hdcp.downstream_info))
+ DRM_ERROR("Downstream_info update failed.\n");
return 0;
}
@@ -1874,6 +1895,15 @@ int intel_hdcp_init(struct intel_connector *connector,
if (ret)
return ret;
+ ret = drm_connector_attach_cp_downstream_property(&connector->base);
+ if (ret)
+ return ret;
+
+ hdcp->downstream_info = kzalloc(sizeof(*hdcp->downstream_info),
+ GFP_KERNEL);
+ if (!hdcp->downstream_info)
+ return -ENOMEM;
+
hdcp->shim = shim;
mutex_init(&hdcp->mutex);
INIT_DELAYED_WORK(&hdcp->check_work, intel_hdcp_check_work);
diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h
index 1e630a593b73..2787a2d555b4 100644
--- a/include/drm/drm_hdcp.h
+++ b/include/drm/drm_hdcp.h
@@ -23,6 +23,7 @@
#define DRM_HDCP_V_PRIME_PART_LEN 4
#define DRM_HDCP_V_PRIME_NUM_PARTS 5
#define DRM_HDCP_NUM_DOWNSTREAM(x) (x & 0x7f)
+#define DRM_HDCP_DEPTH(x) ((x) & 0x7)
#define DRM_HDCP_MAX_CASCADE_EXCEEDED(x) (x & BIT(3))
#define DRM_HDCP_MAX_DEVICE_EXCEEDED(x) (x & BIT(7))
diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
index aae84d025518..93403b2631ef 100644
--- a/include/uapi/drm/drm_mode.h
+++ b/include/uapi/drm/drm_mode.h
@@ -216,8 +216,13 @@ extern "C" {
#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 {
+ /* Version of HDCP authenticated (1.4/2.2) */
+ __u32 ver_in_force;
+
/* KSV of immediate HDCP Sink. In Little-Endian Format. */
char bksv[DRM_MODE_HDCP_KSV_LEN];
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
