From: Ramalingam C <ramalingam.c@intel.com>
To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
daniel.vetter@ffwll.ch, maarten.lankhorst@linux.intel.com
Subject: [PATCH v2 7/8] drm/i915: Populate downstream info for HDCP1.4
Date: Sat, 9 Mar 2019 09:34:51 +0530 [thread overview]
Message-ID: <20190309040452.23699-8-ramalingam.c@intel.com> (raw)
In-Reply-To: <20190309040452.23699-1-ramalingam.c@intel.com>
Implements drm blob property content_protection_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
content_protection_downstream_info property.
v2:
%s/cp_downstream/content_protection_downstream [daniel]
Signed-off-by: Ramalingam C <ramalingam.c@intel.com>
---
drivers/gpu/drm/i915/intel_drv.h | 2 ++
drivers/gpu/drm/i915/intel_hdcp.c | 35 ++++++++++++++++++++++++++++++-
include/drm/drm_hdcp.h | 1 +
include/uapi/drm/drm_mode.h | 5 +++++
4 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 7550f4ed5a98..4e722702897a 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -482,6 +482,8 @@ struct intel_hdcp {
wait_queue_head_t cp_irq_queue;
atomic_t cp_irq_count;
int cp_irq_count_cached;
+
+ struct content_protection_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 b1fa81666490..777f40202a15 100644
--- a/drivers/gpu/drm/i915/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/intel_hdcp.c
@@ -580,6 +580,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;
@@ -593,6 +596,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.
@@ -694,15 +699,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)
@@ -798,6 +808,14 @@ static int _intel_hdcp_disable(struct intel_connector *connector)
return ret;
}
+ memset(hdcp->downstream_info, 0,
+ sizeof(struct content_protection_downstream_info));
+
+ if (drm_connector_update_content_protection_downstream_property(
+ &connector->base,
+ connector->hdcp.downstream_info))
+ DRM_ERROR("Downstream_info update failed.\n");
+
DRM_DEBUG_KMS("HDCP is disabled\n");
return 0;
}
@@ -831,6 +849,10 @@ static int _intel_hdcp_enable(struct intel_connector *connector)
ret = intel_hdcp_auth(connector);
if (!ret) {
connector->hdcp.hdcp_encrypted = true;
+ if (drm_connector_update_content_protection_downstream_property(
+ &connector->base,
+ connector->hdcp.downstream_info))
+ DRM_ERROR("Downstream_info update failed.\n");
return 0;
}
@@ -1882,6 +1904,17 @@ int intel_hdcp_init(struct intel_connector *connector,
if (ret)
return ret;
+ ret = drm_connector_attach_content_protection_downstream_property(
+ &connector->base);
+ if (ret)
+ return ret;
+
+ hdcp->downstream_info =
+ kzalloc(sizeof(struct content_protection_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 652aaf5d658e..654a170f03eb 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 629ed7fdc15a..3973d35c3b57 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 content_protection_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.19.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-03-09 4:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-09 4:04 [PATCH v2 0/8] HDCP2.2 Phase II Ramalingam C
2019-03-09 4:04 ` [PATCH v2 1/8] drm/i915: debugfs: HDCP2.2 capability read Ramalingam C
2019-03-09 4:04 ` [PATCH v2 2/8] drm: Add Content protection type property Ramalingam C
2019-03-09 4:04 ` [PATCH v2 3/8] drm/i915: Attach content " Ramalingam C
2019-03-09 4:04 ` [PATCH v2 4/8] drm/i915: HDCP SRM parsing and revocation check Ramalingam C
2019-03-09 4:04 ` [PATCH v2 5/8] drm/i915/sysfs: Node for hdcp srm Ramalingam C
2019-03-11 13:57 ` Daniel Vetter
2019-03-09 4:04 ` [PATCH v2 6/8] drm: Add CP downstream_info property Ramalingam C
2019-03-09 4:04 ` Ramalingam C [this message]
2019-03-09 4:04 ` [PATCH v2 8/8] drm/i915: Populate downstream info for HDCP2.2 Ramalingam C
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=20190309040452.23699-8-ramalingam.c@intel.com \
--to=ramalingam.c@intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maarten.lankhorst@linux.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;
as well as URLs for NNTP newsgroup(s).