2018-01-08 14:55:39 -05:00
|
|
|
/* SPDX-License-Identifier: MIT */
|
|
|
|
|
/*
|
|
|
|
|
* Copyright (C) 2017 Google, Inc.
|
2019-08-28 22:12:11 +05:30
|
|
|
* Copyright _ 2017-2019, Intel Corporation.
|
2018-01-08 14:55:39 -05:00
|
|
|
*
|
|
|
|
|
* Authors:
|
|
|
|
|
* Sean Paul <seanpaul@chromium.org>
|
2019-08-28 22:12:11 +05:30
|
|
|
* Ramalingam C <ramalingam.c@intel.com>
|
2018-01-08 14:55:39 -05:00
|
|
|
*/
|
|
|
|
|
|
2019-04-05 14:00:13 +03:00
|
|
|
#include <linux/component.h>
|
2018-01-08 14:55:39 -05:00
|
|
|
#include <linux/i2c.h>
|
|
|
|
|
#include <linux/random.h>
|
|
|
|
|
|
2022-04-21 09:31:06 +02:00
|
|
|
#include <drm/display/drm_hdcp_helper.h>
|
2019-04-05 14:00:13 +03:00
|
|
|
#include <drm/i915_component.h>
|
|
|
|
|
|
2021-01-11 13:41:12 +05:30
|
|
|
#include "i915_drv.h"
|
2018-01-08 14:55:39 -05:00
|
|
|
#include "i915_reg.h"
|
2021-10-14 13:28:57 +03:00
|
|
|
#include "intel_connector.h"
|
2021-04-30 17:39:44 +03:00
|
|
|
#include "intel_de.h"
|
2021-10-14 13:28:57 +03:00
|
|
|
#include "intel_display_power.h"
|
2022-02-22 18:51:37 +02:00
|
|
|
#include "intel_display_power_well.h"
|
2019-08-06 14:39:33 +03:00
|
|
|
#include "intel_display_types.h"
|
2019-04-05 14:00:13 +03:00
|
|
|
#include "intel_hdcp.h"
|
2022-08-04 12:58:34 +03:00
|
|
|
#include "intel_hdcp_regs.h"
|
2021-10-14 13:28:57 +03:00
|
|
|
#include "intel_pcode.h"
|
2018-01-08 14:55:39 -05:00
|
|
|
|
|
|
|
|
#define KEY_LOAD_TRIES 5
|
2019-02-16 23:06:54 +05:30
|
|
|
#define HDCP2_LC_RETRY_CNT 3
|
2018-01-08 14:55:39 -05:00
|
|
|
|
2021-01-11 13:41:15 +05:30
|
|
|
static int intel_conn_to_vcpi(struct intel_connector *connector)
|
|
|
|
|
{
|
drm/display/dp_mst: Move all payload info into the atomic state
Now that we've finally gotten rid of the non-atomic MST users leftover in
the kernel, we can finally get rid of all of the legacy payload code we
have and move as much as possible into the MST atomic state structs. The
main purpose of this is to make the MST code a lot less confusing to work
on, as there's a lot of duplicated logic that doesn't really need to be
here. As well, this should make introducing features like fallback link
retraining and DSC support far easier.
Since the old payload code was pretty gnarly and there's a Lot of changes
here, I expect this might be a bit difficult to review. So to make things
as easy as possible for reviewers, I'll sum up how both the old and new
code worked here (it took me a while to figure this out too!).
The old MST code basically worked by maintaining two different payload
tables - proposed_vcpis, and payloads. proposed_vcpis would hold the
modified payload we wanted to push to the topology, while payloads held the
payload table that was currently programmed in hardware. Modifications to
proposed_vcpis would be handled through drm_dp_allocate_vcpi(),
drm_dp_mst_deallocate_vcpi(), and drm_dp_mst_reset_vcpi_slots(). Then, they
would be pushed via drm_dp_mst_update_payload_step1() and
drm_dp_mst_update_payload_step2().
Furthermore, it's important to note how adding and removing VC payloads
actually worked with drm_dp_mst_update_payload_step1(). When a VC payload
is removed from the VC table, all VC payloads which come after the removed
VC payload's slots must have their time slots shifted towards the start of
the table. The old code handles this by looping through the entire payload
table and recomputing the start slot for every payload in the topology from
scratch. While very much overkill, this ends up doing the right thing
because we always order the VCPIs for payloads from first to last starting
timeslot.
It's important to also note that drm_dp_mst_update_payload_step2() isn't
actually limited to updating a single payload - the driver can use it to
queue up multiple payload changes so that as many of them can be sent as
possible before waiting for the ACT. This is -technically- not against
spec, but as Wayne Lin has pointed out it's not consistently implemented
correctly in hubs - so it might as well be.
drm_dp_mst_update_payload_step2() is pretty self explanatory and basically
the same between the old and new code, save for the fact we don't have a
second step for deleting payloads anymore -and thus rename it to
drm_dp_mst_add_payload_step2().
The new payload code stores all of the current payload info within the MST
atomic state and computes as much of the state as possible ahead of time.
This has the one exception of the starting timeslots for payloads, which
can't be determined at atomic check time since the starting time slots will
vary depending on what order CRTCs are enabled in the atomic state - which
varies from driver to driver. These are still stored in the atomic MST
state, but are only copied from the old MST state during atomic commit
time. Likewise, this is when new start slots are determined.
Adding/removing payloads now works much more closely to how things are
described in the spec. When we delete a payload, we loop through the
current list of payloads and update the start slots for any payloads whose
time slots came after the payload we just deleted. Determining the starting
time slots for new payloads being added is done by simply keeping track of
where the end of the VC table is in
drm_dp_mst_topology_mgr->next_start_slot. Additionally, it's worth noting
that we no longer have a single update_payload() function. Instead, we now
have drm_dp_mst_add_payload_step1|2() and drm_dp_mst_remove_payload(). As
such, it's now left it up to the driver to figure out when to add or remove
payloads. The driver already knows when it's disabling/enabling CRTCs, so
it also already knows when payloads should be added or removed.
Changes since v1:
* Refactor around all of the completely dead code changes that are
happening in amdgpu for some reason when they really shouldn't even be
there in the first place… :\
* Remove mention of sending one ACT per series of payload updates. As Wayne
Lin pointed out, there are apparently hubs on the market that don't work
correctly with this scheme and require a separate ACT per payload update.
* Fix accidental drop of mst_mgr.lock - Wayne Lin
* Remove mentions of allowing multiple ACT updates per payload change,
mention that this is a result of vendors not consistently supporting this
part of the spec and requiring a unique ACT for each payload change.
* Get rid of reference to drm_dp_mst_port in DC - turns out I just got
myself confused by DC and we don't actually need this.
Changes since v2:
* Get rid of fix for not sending payload deallocations if ddps=0 and just
go back to wayne's fix
Signed-off-by: Lyude Paul <lyude@redhat.com>
Cc: Wayne Lin <Wayne.Lin@amd.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Fangzhi Zuo <Jerry.Zuo@amd.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Sean Paul <sean@poorly.run>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220817193847.557945-18-lyude@redhat.com
2022-08-17 15:38:46 -04:00
|
|
|
struct drm_dp_mst_topology_mgr *mgr;
|
|
|
|
|
struct drm_dp_mst_atomic_payload *payload;
|
|
|
|
|
struct drm_dp_mst_topology_state *mst_state;
|
|
|
|
|
int vcpi = 0;
|
|
|
|
|
|
2021-01-11 13:41:15 +05:30
|
|
|
/* For HDMI this is forced to be 0x0. For DP SST also this is 0x0. */
|
drm/display/dp_mst: Move all payload info into the atomic state
Now that we've finally gotten rid of the non-atomic MST users leftover in
the kernel, we can finally get rid of all of the legacy payload code we
have and move as much as possible into the MST atomic state structs. The
main purpose of this is to make the MST code a lot less confusing to work
on, as there's a lot of duplicated logic that doesn't really need to be
here. As well, this should make introducing features like fallback link
retraining and DSC support far easier.
Since the old payload code was pretty gnarly and there's a Lot of changes
here, I expect this might be a bit difficult to review. So to make things
as easy as possible for reviewers, I'll sum up how both the old and new
code worked here (it took me a while to figure this out too!).
The old MST code basically worked by maintaining two different payload
tables - proposed_vcpis, and payloads. proposed_vcpis would hold the
modified payload we wanted to push to the topology, while payloads held the
payload table that was currently programmed in hardware. Modifications to
proposed_vcpis would be handled through drm_dp_allocate_vcpi(),
drm_dp_mst_deallocate_vcpi(), and drm_dp_mst_reset_vcpi_slots(). Then, they
would be pushed via drm_dp_mst_update_payload_step1() and
drm_dp_mst_update_payload_step2().
Furthermore, it's important to note how adding and removing VC payloads
actually worked with drm_dp_mst_update_payload_step1(). When a VC payload
is removed from the VC table, all VC payloads which come after the removed
VC payload's slots must have their time slots shifted towards the start of
the table. The old code handles this by looping through the entire payload
table and recomputing the start slot for every payload in the topology from
scratch. While very much overkill, this ends up doing the right thing
because we always order the VCPIs for payloads from first to last starting
timeslot.
It's important to also note that drm_dp_mst_update_payload_step2() isn't
actually limited to updating a single payload - the driver can use it to
queue up multiple payload changes so that as many of them can be sent as
possible before waiting for the ACT. This is -technically- not against
spec, but as Wayne Lin has pointed out it's not consistently implemented
correctly in hubs - so it might as well be.
drm_dp_mst_update_payload_step2() is pretty self explanatory and basically
the same between the old and new code, save for the fact we don't have a
second step for deleting payloads anymore -and thus rename it to
drm_dp_mst_add_payload_step2().
The new payload code stores all of the current payload info within the MST
atomic state and computes as much of the state as possible ahead of time.
This has the one exception of the starting timeslots for payloads, which
can't be determined at atomic check time since the starting time slots will
vary depending on what order CRTCs are enabled in the atomic state - which
varies from driver to driver. These are still stored in the atomic MST
state, but are only copied from the old MST state during atomic commit
time. Likewise, this is when new start slots are determined.
Adding/removing payloads now works much more closely to how things are
described in the spec. When we delete a payload, we loop through the
current list of payloads and update the start slots for any payloads whose
time slots came after the payload we just deleted. Determining the starting
time slots for new payloads being added is done by simply keeping track of
where the end of the VC table is in
drm_dp_mst_topology_mgr->next_start_slot. Additionally, it's worth noting
that we no longer have a single update_payload() function. Instead, we now
have drm_dp_mst_add_payload_step1|2() and drm_dp_mst_remove_payload(). As
such, it's now left it up to the driver to figure out when to add or remove
payloads. The driver already knows when it's disabling/enabling CRTCs, so
it also already knows when payloads should be added or removed.
Changes since v1:
* Refactor around all of the completely dead code changes that are
happening in amdgpu for some reason when they really shouldn't even be
there in the first place… :\
* Remove mention of sending one ACT per series of payload updates. As Wayne
Lin pointed out, there are apparently hubs on the market that don't work
correctly with this scheme and require a separate ACT per payload update.
* Fix accidental drop of mst_mgr.lock - Wayne Lin
* Remove mentions of allowing multiple ACT updates per payload change,
mention that this is a result of vendors not consistently supporting this
part of the spec and requiring a unique ACT for each payload change.
* Get rid of reference to drm_dp_mst_port in DC - turns out I just got
myself confused by DC and we don't actually need this.
Changes since v2:
* Get rid of fix for not sending payload deallocations if ddps=0 and just
go back to wayne's fix
Signed-off-by: Lyude Paul <lyude@redhat.com>
Cc: Wayne Lin <Wayne.Lin@amd.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Fangzhi Zuo <Jerry.Zuo@amd.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Sean Paul <sean@poorly.run>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220817193847.557945-18-lyude@redhat.com
2022-08-17 15:38:46 -04:00
|
|
|
if (!connector->port)
|
|
|
|
|
return 0;
|
|
|
|
|
mgr = connector->port->mgr;
|
|
|
|
|
|
|
|
|
|
drm_modeset_lock(&mgr->base.lock, NULL);
|
|
|
|
|
mst_state = to_drm_dp_mst_topology_state(mgr->base.state);
|
|
|
|
|
payload = drm_atomic_get_mst_payload_state(mst_state, connector->port);
|
|
|
|
|
if (drm_WARN_ON(mgr->dev, !payload))
|
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
|
|
vcpi = payload->vcpi;
|
|
|
|
|
if (drm_WARN_ON(mgr->dev, vcpi < 0)) {
|
|
|
|
|
vcpi = 0;
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
out:
|
|
|
|
|
drm_modeset_unlock(&mgr->base.lock);
|
|
|
|
|
return vcpi;
|
2021-01-11 13:41:15 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* intel_hdcp_required_content_stream selects the most highest common possible HDCP
|
|
|
|
|
* content_type for all streams in DP MST topology because security f/w doesn't
|
|
|
|
|
* have any provision to mark content_type for each stream separately, it marks
|
|
|
|
|
* all available streams with the content_type proivided at the time of port
|
|
|
|
|
* authentication. This may prohibit the userspace to use type1 content on
|
|
|
|
|
* HDCP 2.2 capable sink because of other sink are not capable of HDCP 2.2 in
|
|
|
|
|
* DP MST topology. Though it is not compulsory, security fw should change its
|
|
|
|
|
* policy to mark different content_types for different streams.
|
|
|
|
|
*/
|
|
|
|
|
static int
|
|
|
|
|
intel_hdcp_required_content_stream(struct intel_digital_port *dig_port)
|
|
|
|
|
{
|
|
|
|
|
struct drm_connector_list_iter conn_iter;
|
|
|
|
|
struct intel_digital_port *conn_dig_port;
|
|
|
|
|
struct intel_connector *connector;
|
|
|
|
|
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
|
|
|
|
|
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
|
|
|
|
|
bool enforce_type0 = false;
|
|
|
|
|
int k;
|
|
|
|
|
|
2021-01-19 12:16:54 +05:30
|
|
|
data->k = 0;
|
|
|
|
|
|
2021-01-11 13:41:15 +05:30
|
|
|
if (dig_port->hdcp_auth_status)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
drm_connector_list_iter_begin(&i915->drm, &conn_iter);
|
|
|
|
|
for_each_intel_connector_iter(connector, &conn_iter) {
|
|
|
|
|
if (connector->base.status == connector_status_disconnected)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (!intel_encoder_is_mst(intel_attached_encoder(connector)))
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
conn_dig_port = intel_attached_dig_port(connector);
|
|
|
|
|
if (conn_dig_port != dig_port)
|
|
|
|
|
continue;
|
|
|
|
|
|
2021-08-19 11:48:35 -07:00
|
|
|
if (!enforce_type0 && !dig_port->hdcp_mst_type1_capable)
|
2021-01-11 13:41:15 +05:30
|
|
|
enforce_type0 = true;
|
|
|
|
|
|
|
|
|
|
data->streams[data->k].stream_id = intel_conn_to_vcpi(connector);
|
|
|
|
|
data->k++;
|
|
|
|
|
|
|
|
|
|
/* if there is only one active stream */
|
|
|
|
|
if (dig_port->dp.active_mst_links <= 1)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
drm_connector_list_iter_end(&conn_iter);
|
|
|
|
|
|
|
|
|
|
if (drm_WARN_ON(&i915->drm, data->k > INTEL_NUM_PIPES(i915) || data->k == 0))
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Apply common protection level across all streams in DP MST Topology.
|
|
|
|
|
* Use highest supported content type for all streams in DP MST Topology.
|
|
|
|
|
*/
|
|
|
|
|
for (k = 0; k < data->k; k++)
|
|
|
|
|
data->streams[k].stream_type =
|
|
|
|
|
enforce_type0 ? DRM_MODE_HDCP_CONTENT_TYPE0 : DRM_MODE_HDCP_CONTENT_TYPE1;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2021-08-19 11:48:35 -07:00
|
|
|
static int intel_hdcp_prepare_streams(struct intel_connector *connector)
|
|
|
|
|
{
|
|
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
|
|
|
|
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
|
|
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
if (!intel_encoder_is_mst(intel_attached_encoder(connector))) {
|
|
|
|
|
data->k = 1;
|
|
|
|
|
data->streams[0].stream_type = hdcp->content_type;
|
|
|
|
|
} else {
|
|
|
|
|
ret = intel_hdcp_required_content_stream(dig_port);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2018-10-23 14:52:27 +05:30
|
|
|
static
|
|
|
|
|
bool intel_hdcp_is_ksv_valid(u8 *ksv)
|
|
|
|
|
{
|
|
|
|
|
int i, ones = 0;
|
|
|
|
|
/* KSV has 20 1's and 20 0's */
|
|
|
|
|
for (i = 0; i < DRM_HDCP_KSV_LEN; i++)
|
|
|
|
|
ones += hweight8(ksv[i]);
|
|
|
|
|
if (ones != 20)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static
|
2020-06-30 21:50:54 -07:00
|
|
|
int intel_hdcp_read_valid_bksv(struct intel_digital_port *dig_port,
|
2018-10-23 14:52:27 +05:30
|
|
|
const struct intel_hdcp_shim *shim, u8 *bksv)
|
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
|
2018-10-23 14:52:27 +05:30
|
|
|
int ret, i, tries = 2;
|
|
|
|
|
|
|
|
|
|
/* HDCP spec states that we must retry the bksv if it is invalid */
|
|
|
|
|
for (i = 0; i < tries; i++) {
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = shim->read_bksv(dig_port, bksv);
|
2018-10-23 14:52:27 +05:30
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
if (intel_hdcp_is_ksv_valid(bksv))
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (i == tries) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&i915->drm, "Bksv is invalid\n");
|
2018-10-23 14:52:27 +05:30
|
|
|
return -ENODEV;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2018-10-23 14:52:29 +05:30
|
|
|
/* Is HDCP1.4 capable on Platform and Sink */
|
|
|
|
|
bool intel_hdcp_capable(struct intel_connector *connector)
|
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2018-10-29 15:15:46 +05:30
|
|
|
const struct intel_hdcp_shim *shim = connector->hdcp.shim;
|
2018-10-23 14:52:29 +05:30
|
|
|
bool capable = false;
|
|
|
|
|
u8 bksv[5];
|
|
|
|
|
|
|
|
|
|
if (!shim)
|
|
|
|
|
return capable;
|
|
|
|
|
|
|
|
|
|
if (shim->hdcp_capable) {
|
2020-06-30 21:50:54 -07:00
|
|
|
shim->hdcp_capable(dig_port, &capable);
|
2018-10-23 14:52:29 +05:30
|
|
|
} else {
|
2020-06-30 21:50:54 -07:00
|
|
|
if (!intel_hdcp_read_valid_bksv(dig_port, shim, bksv))
|
2018-10-23 14:52:29 +05:30
|
|
|
capable = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return capable;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:53 +05:30
|
|
|
/* Is HDCP2.2 capable on Platform and Sink */
|
2019-05-07 21:57:36 +05:30
|
|
|
bool intel_hdcp2_capable(struct intel_connector *connector)
|
2019-02-16 23:06:53 +05:30
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2019-12-04 20:05:49 +02:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2019-02-16 23:06:53 +05:30
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
|
|
|
|
bool capable = false;
|
|
|
|
|
|
|
|
|
|
/* I915 support for HDCP2.2 */
|
|
|
|
|
if (!hdcp->hdcp2_supported)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
/* MEI interface is solid */
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
|
|
|
|
|
if (!dev_priv->display.hdcp.comp_added || !dev_priv->display.hdcp.master) {
|
|
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-21 08:48:33 +00:00
|
|
|
return false;
|
|
|
|
|
}
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:53 +05:30
|
|
|
|
|
|
|
|
/* Sink's capability for HDCP2.2 */
|
2020-06-30 21:50:54 -07:00
|
|
|
hdcp->shim->hdcp_2_2_capable(dig_port, &capable);
|
2019-02-16 23:06:53 +05:30
|
|
|
|
|
|
|
|
return capable;
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-20 17:04:38 +03:00
|
|
|
static bool intel_hdcp_in_use(struct drm_i915_private *dev_priv,
|
|
|
|
|
enum transcoder cpu_transcoder, enum port port)
|
2019-02-16 23:06:52 +05:30
|
|
|
{
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
return intel_de_read(dev_priv,
|
|
|
|
|
HDCP_STATUS(dev_priv, cpu_transcoder, port)) &
|
2019-08-28 22:12:16 +05:30
|
|
|
HDCP_STATUS_ENC;
|
2019-02-16 23:06:52 +05:30
|
|
|
}
|
|
|
|
|
|
2020-04-20 17:04:38 +03:00
|
|
|
static bool intel_hdcp2_in_use(struct drm_i915_private *dev_priv,
|
|
|
|
|
enum transcoder cpu_transcoder, enum port port)
|
2019-02-16 23:06:57 +05:30
|
|
|
{
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
return intel_de_read(dev_priv,
|
|
|
|
|
HDCP2_STATUS(dev_priv, cpu_transcoder, port)) &
|
2019-08-28 22:12:16 +05:30
|
|
|
LINK_ENCRYPTION_STATUS;
|
2019-02-16 23:06:57 +05:30
|
|
|
}
|
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
static int intel_hdcp_poll_ksv_fifo(struct intel_digital_port *dig_port,
|
2018-01-08 14:55:39 -05:00
|
|
|
const struct intel_hdcp_shim *shim)
|
|
|
|
|
{
|
|
|
|
|
int ret, read_ret;
|
|
|
|
|
bool ksv_ready;
|
|
|
|
|
|
|
|
|
|
/* Poll for ksv list ready (spec says max time allowed is 5s) */
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = __wait_for(read_ret = shim->read_ksv_ready(dig_port,
|
2018-01-08 14:55:39 -05:00
|
|
|
&ksv_ready),
|
|
|
|
|
read_ret || ksv_ready, 5 * 1000 * 1000, 1000,
|
|
|
|
|
100 * 1000);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
if (read_ret)
|
|
|
|
|
return read_ret;
|
|
|
|
|
if (!ksv_ready)
|
|
|
|
|
return -ETIMEDOUT;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-02 15:40:33 +05:30
|
|
|
static bool hdcp_key_loadable(struct drm_i915_private *dev_priv)
|
|
|
|
|
{
|
|
|
|
|
enum i915_power_well_id id;
|
2020-08-05 17:15:21 +05:30
|
|
|
intel_wakeref_t wakeref;
|
2018-04-02 15:40:33 +05:30
|
|
|
bool enabled = false;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* On HSW and BDW, Display HW loads the Key as soon as Display resumes.
|
|
|
|
|
* On all BXT+, SW can load the keys only when the PW#1 is turned on.
|
|
|
|
|
*/
|
|
|
|
|
if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
|
|
|
|
|
id = HSW_DISP_PW_GLOBAL;
|
|
|
|
|
else
|
|
|
|
|
id = SKL_DISP_PW_1;
|
|
|
|
|
|
|
|
|
|
/* PG1 (power well #1) needs to be enabled */
|
2020-08-05 17:15:21 +05:30
|
|
|
with_intel_runtime_pm(&dev_priv->runtime_pm, wakeref)
|
|
|
|
|
enabled = intel_display_power_well_is_enabled(dev_priv, id);
|
2018-04-02 15:40:33 +05:30
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Another req for hdcp key loadability is enabled state of pll for
|
|
|
|
|
* cdclk. Without active crtc we wont land here. So we are assuming that
|
|
|
|
|
* cdclk is already on.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
return enabled;
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-08 14:55:39 -05:00
|
|
|
static void intel_hdcp_clear_keys(struct drm_i915_private *dev_priv)
|
|
|
|
|
{
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_KEY_CONF, HDCP_CLEAR_KEYS_TRIGGER);
|
|
|
|
|
intel_de_write(dev_priv, HDCP_KEY_STATUS,
|
|
|
|
|
HDCP_KEY_LOAD_DONE | HDCP_KEY_LOAD_STATUS | HDCP_FUSE_IN_PROGRESS | HDCP_FUSE_ERROR | HDCP_FUSE_DONE);
|
2018-01-08 14:55:39 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int intel_hdcp_load_keys(struct drm_i915_private *dev_priv)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
u32 val;
|
|
|
|
|
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
val = intel_de_read(dev_priv, HDCP_KEY_STATUS);
|
2018-02-03 03:39:07 +05:30
|
|
|
if ((val & HDCP_KEY_LOAD_DONE) && (val & HDCP_KEY_LOAD_STATUS))
|
|
|
|
|
return 0;
|
|
|
|
|
|
2018-01-18 11:18:05 +05:30
|
|
|
/*
|
|
|
|
|
* On HSW and BDW HW loads the HDCP1.4 Key when Display comes
|
|
|
|
|
* out of reset. So if Key is not already loaded, its an error state.
|
|
|
|
|
*/
|
|
|
|
|
if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
if (!(intel_de_read(dev_priv, HDCP_KEY_STATUS) & HDCP_KEY_LOAD_DONE))
|
2018-01-18 11:18:05 +05:30
|
|
|
return -ENXIO;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Initiate loading the HDCP key from fuses.
|
|
|
|
|
*
|
2021-04-07 13:39:45 -07:00
|
|
|
* BXT+ platforms, HDCP key needs to be loaded by SW. Only display
|
|
|
|
|
* version 9 platforms (minus BXT) differ in the key load trigger
|
|
|
|
|
* process from other platforms. These platforms use the GT Driver
|
|
|
|
|
* Mailbox interface.
|
2018-01-18 11:18:05 +05:30
|
|
|
*/
|
drm/i915/display: rename display version macros
While converting the rest of the driver to use GRAPHICS_VER() and
MEDIA_VER(), following what was done for display, some discussions went
back on what we did for display:
1) Why is the == comparison special that deserves a separate
macro instead of just getting the version and comparing directly
like is done for >, >=, <=?
2) IS_DISPLAY_RANGE() is weird in that it omits the "_VER" for
brevity. If we remove the current users of IS_DISPLAY_VER(), we
could actually repurpose it for a range check
With (1) there could be an advantage if we used gen_mask since multiple
conditionals be combined by the compiler in a single and instruction and
check the result. However a) INTEL_GEN() doesn't use the mask since it
would make the code bigger everywhere else and b) in the cases it made
sense, it also made sense to convert to the _RANGE() variant.
So here we repurpose IS_DISPLAY_VER() to work with a [ from, to ] range
like was the IS_DISPLAY_RANGE() and convert the current IS_DISPLAY_VER()
users to use == and != operators. Aside from the definition changes,
this was done by the following semantic patch:
@@ expression dev_priv, E1; @@
- !IS_DISPLAY_VER(dev_priv, E1)
+ DISPLAY_VER(dev_priv) != E1
@@ expression dev_priv, E1; @@
- IS_DISPLAY_VER(dev_priv, E1)
+ DISPLAY_VER(dev_priv) == E1
@@ expression dev_priv, from, until; @@
- IS_DISPLAY_RANGE(dev_priv, from, until)
+ IS_DISPLAY_VER(dev_priv, from, until)
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
[Jani: Minor conflict resolve while applying.]
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20210413051002.92589-4-lucas.demarchi@intel.com
2021-04-12 22:09:53 -07:00
|
|
|
if (DISPLAY_VER(dev_priv) == 9 && !IS_BROXTON(dev_priv)) {
|
2022-05-19 09:57:31 +01:00
|
|
|
ret = snb_pcode_write(&dev_priv->uncore, SKL_PCODE_LOAD_HDCP_KEYS, 1);
|
2018-01-18 11:18:05 +05:30
|
|
|
if (ret) {
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_err(&dev_priv->drm,
|
|
|
|
|
"Failed to initiate HDCP key load (%d)\n",
|
|
|
|
|
ret);
|
2018-01-18 11:18:05 +05:30
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_KEY_CONF, HDCP_KEY_LOAD_TRIGGER);
|
2018-01-08 14:55:39 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Wait for the keys to load (500us) */
|
2019-03-25 14:49:39 -07:00
|
|
|
ret = __intel_wait_for_register(&dev_priv->uncore, HDCP_KEY_STATUS,
|
2018-01-08 14:55:39 -05:00
|
|
|
HDCP_KEY_LOAD_DONE, HDCP_KEY_LOAD_DONE,
|
|
|
|
|
10, 1, &val);
|
|
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
else if (!(val & HDCP_KEY_LOAD_STATUS))
|
|
|
|
|
return -ENXIO;
|
|
|
|
|
|
|
|
|
|
/* Send Aksv over to PCH display for use in authentication */
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_KEY_CONF, HDCP_AKSV_SEND_TRIGGER);
|
2018-01-08 14:55:39 -05:00
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Returns updated SHA-1 index */
|
|
|
|
|
static int intel_write_sha_text(struct drm_i915_private *dev_priv, u32 sha_text)
|
|
|
|
|
{
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_SHA_TEXT, sha_text);
|
2019-08-15 18:23:43 -07:00
|
|
|
if (intel_de_wait_for_set(dev_priv, HDCP_REP_CTL, HDCP_SHA1_READY, 1)) {
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_err(&dev_priv->drm, "Timed out waiting for SHA1 ready\n");
|
2018-01-08 14:55:39 -05:00
|
|
|
return -ETIMEDOUT;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static
|
2019-08-28 22:12:16 +05:30
|
|
|
u32 intel_hdcp_get_repeater_ctl(struct drm_i915_private *dev_priv,
|
|
|
|
|
enum transcoder cpu_transcoder, enum port port)
|
2018-01-08 14:55:39 -05:00
|
|
|
{
|
2021-03-19 21:42:42 -07:00
|
|
|
if (DISPLAY_VER(dev_priv) >= 12) {
|
2019-08-28 22:12:16 +05:30
|
|
|
switch (cpu_transcoder) {
|
|
|
|
|
case TRANSCODER_A:
|
|
|
|
|
return HDCP_TRANSA_REP_PRESENT |
|
|
|
|
|
HDCP_TRANSA_SHA1_M0;
|
|
|
|
|
case TRANSCODER_B:
|
|
|
|
|
return HDCP_TRANSB_REP_PRESENT |
|
|
|
|
|
HDCP_TRANSB_SHA1_M0;
|
|
|
|
|
case TRANSCODER_C:
|
|
|
|
|
return HDCP_TRANSC_REP_PRESENT |
|
|
|
|
|
HDCP_TRANSC_SHA1_M0;
|
|
|
|
|
case TRANSCODER_D:
|
|
|
|
|
return HDCP_TRANSD_REP_PRESENT |
|
|
|
|
|
HDCP_TRANSD_SHA1_M0;
|
|
|
|
|
default:
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_err(&dev_priv->drm, "Unknown transcoder %d\n",
|
|
|
|
|
cpu_transcoder);
|
2019-08-28 22:12:16 +05:30
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-08 14:55:39 -05:00
|
|
|
switch (port) {
|
|
|
|
|
case PORT_A:
|
|
|
|
|
return HDCP_DDIA_REP_PRESENT | HDCP_DDIA_SHA1_M0;
|
|
|
|
|
case PORT_B:
|
|
|
|
|
return HDCP_DDIB_REP_PRESENT | HDCP_DDIB_SHA1_M0;
|
|
|
|
|
case PORT_C:
|
|
|
|
|
return HDCP_DDIC_REP_PRESENT | HDCP_DDIC_SHA1_M0;
|
|
|
|
|
case PORT_D:
|
|
|
|
|
return HDCP_DDID_REP_PRESENT | HDCP_DDID_SHA1_M0;
|
|
|
|
|
case PORT_E:
|
|
|
|
|
return HDCP_DDIE_REP_PRESENT | HDCP_DDIE_SHA1_M0;
|
|
|
|
|
default:
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_err(&dev_priv->drm, "Unknown port %d\n", port);
|
2019-08-28 22:12:16 +05:30
|
|
|
return -EINVAL;
|
2018-01-08 14:55:39 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static
|
2019-08-28 22:12:16 +05:30
|
|
|
int intel_hdcp_validate_v_prime(struct intel_connector *connector,
|
2018-04-02 15:40:32 +05:30
|
|
|
const struct intel_hdcp_shim *shim,
|
|
|
|
|
u8 *ksv_fifo, u8 num_downstream, u8 *bstatus)
|
2018-01-08 14:55:39 -05:00
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2019-12-04 20:05:49 +02:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2019-08-28 22:12:16 +05:30
|
|
|
enum transcoder cpu_transcoder = connector->hdcp.cpu_transcoder;
|
2020-06-30 21:50:54 -07:00
|
|
|
enum port port = dig_port->base.port;
|
2018-01-08 14:55:39 -05:00
|
|
|
u32 vprime, sha_text, sha_leftovers, rep_ctl;
|
|
|
|
|
int ret, i, j, sha_idx;
|
|
|
|
|
|
|
|
|
|
/* Process V' values from the receiver */
|
|
|
|
|
for (i = 0; i < DRM_HDCP_V_PRIME_NUM_PARTS; i++) {
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = shim->read_v_prime_part(dig_port, i, &vprime);
|
2018-01-08 14:55:39 -05:00
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_SHA_V_PRIME(i), vprime);
|
2018-01-08 14:55:39 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* We need to write the concatenation of all device KSVs, BINFO (DP) ||
|
|
|
|
|
* BSTATUS (HDMI), and M0 (which is added via HDCP_REP_CTL). This byte
|
|
|
|
|
* stream is written via the HDCP_SHA_TEXT register in 32-bit
|
|
|
|
|
* increments. Every 64 bytes, we need to write HDCP_REP_CTL again. This
|
|
|
|
|
* index will keep track of our progress through the 64 bytes as well as
|
|
|
|
|
* helping us work the 40-bit KSVs through our 32-bit register.
|
|
|
|
|
*
|
|
|
|
|
* NOTE: data passed via HDCP_SHA_TEXT should be big-endian
|
|
|
|
|
*/
|
|
|
|
|
sha_idx = 0;
|
|
|
|
|
sha_text = 0;
|
|
|
|
|
sha_leftovers = 0;
|
2019-08-28 22:12:16 +05:30
|
|
|
rep_ctl = intel_hdcp_get_repeater_ctl(dev_priv, cpu_transcoder, port);
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_REP_CTL, rep_ctl | HDCP_SHA1_TEXT_32);
|
2018-01-08 14:55:39 -05:00
|
|
|
for (i = 0; i < num_downstream; i++) {
|
|
|
|
|
unsigned int sha_empty;
|
|
|
|
|
u8 *ksv = &ksv_fifo[i * DRM_HDCP_KSV_LEN];
|
|
|
|
|
|
|
|
|
|
/* Fill up the empty slots in sha_text and write it out */
|
|
|
|
|
sha_empty = sizeof(sha_text) - sha_leftovers;
|
2020-08-18 11:38:49 -04:00
|
|
|
for (j = 0; j < sha_empty; j++) {
|
|
|
|
|
u8 off = ((sizeof(sha_text) - j - 1 - sha_leftovers) * 8);
|
|
|
|
|
sha_text |= ksv[j] << off;
|
|
|
|
|
}
|
2018-01-08 14:55:39 -05:00
|
|
|
|
|
|
|
|
ret = intel_write_sha_text(dev_priv, sha_text);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
/* Programming guide writes this every 64 bytes */
|
|
|
|
|
sha_idx += sizeof(sha_text);
|
|
|
|
|
if (!(sha_idx % 64))
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_REP_CTL,
|
|
|
|
|
rep_ctl | HDCP_SHA1_TEXT_32);
|
2018-01-08 14:55:39 -05:00
|
|
|
|
|
|
|
|
/* Store the leftover bytes from the ksv in sha_text */
|
|
|
|
|
sha_leftovers = DRM_HDCP_KSV_LEN - sha_empty;
|
|
|
|
|
sha_text = 0;
|
|
|
|
|
for (j = 0; j < sha_leftovers; j++)
|
|
|
|
|
sha_text |= ksv[sha_empty + j] <<
|
|
|
|
|
((sizeof(sha_text) - j - 1) * 8);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* If we still have room in sha_text for more data, continue.
|
|
|
|
|
* Otherwise, write it out immediately.
|
|
|
|
|
*/
|
|
|
|
|
if (sizeof(sha_text) > sha_leftovers)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
ret = intel_write_sha_text(dev_priv, sha_text);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
sha_leftovers = 0;
|
|
|
|
|
sha_text = 0;
|
|
|
|
|
sha_idx += sizeof(sha_text);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* We need to write BINFO/BSTATUS, and M0 now. Depending on how many
|
|
|
|
|
* bytes are leftover from the last ksv, we might be able to fit them
|
|
|
|
|
* all in sha_text (first 2 cases), or we might need to split them up
|
|
|
|
|
* into 2 writes (last 2 cases).
|
|
|
|
|
*/
|
|
|
|
|
if (sha_leftovers == 0) {
|
|
|
|
|
/* Write 16 bits of text, 16 bits of M0 */
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_REP_CTL,
|
|
|
|
|
rep_ctl | HDCP_SHA1_TEXT_16);
|
2018-01-08 14:55:39 -05:00
|
|
|
ret = intel_write_sha_text(dev_priv,
|
|
|
|
|
bstatus[0] << 8 | bstatus[1]);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
sha_idx += sizeof(sha_text);
|
|
|
|
|
|
|
|
|
|
/* Write 32 bits of M0 */
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_REP_CTL,
|
|
|
|
|
rep_ctl | HDCP_SHA1_TEXT_0);
|
2018-01-08 14:55:39 -05:00
|
|
|
ret = intel_write_sha_text(dev_priv, 0);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
sha_idx += sizeof(sha_text);
|
|
|
|
|
|
|
|
|
|
/* Write 16 bits of M0 */
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_REP_CTL,
|
|
|
|
|
rep_ctl | HDCP_SHA1_TEXT_16);
|
2018-01-08 14:55:39 -05:00
|
|
|
ret = intel_write_sha_text(dev_priv, 0);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
sha_idx += sizeof(sha_text);
|
|
|
|
|
|
|
|
|
|
} else if (sha_leftovers == 1) {
|
|
|
|
|
/* Write 24 bits of text, 8 bits of M0 */
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_REP_CTL,
|
|
|
|
|
rep_ctl | HDCP_SHA1_TEXT_24);
|
2018-01-08 14:55:39 -05:00
|
|
|
sha_text |= bstatus[0] << 16 | bstatus[1] << 8;
|
|
|
|
|
/* Only 24-bits of data, must be in the LSB */
|
|
|
|
|
sha_text = (sha_text & 0xffffff00) >> 8;
|
|
|
|
|
ret = intel_write_sha_text(dev_priv, sha_text);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
sha_idx += sizeof(sha_text);
|
|
|
|
|
|
|
|
|
|
/* Write 32 bits of M0 */
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_REP_CTL,
|
|
|
|
|
rep_ctl | HDCP_SHA1_TEXT_0);
|
2018-01-08 14:55:39 -05:00
|
|
|
ret = intel_write_sha_text(dev_priv, 0);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
sha_idx += sizeof(sha_text);
|
|
|
|
|
|
|
|
|
|
/* Write 24 bits of M0 */
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_REP_CTL,
|
|
|
|
|
rep_ctl | HDCP_SHA1_TEXT_8);
|
2018-01-08 14:55:39 -05:00
|
|
|
ret = intel_write_sha_text(dev_priv, 0);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
sha_idx += sizeof(sha_text);
|
|
|
|
|
|
|
|
|
|
} else if (sha_leftovers == 2) {
|
|
|
|
|
/* Write 32 bits of text */
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_REP_CTL,
|
|
|
|
|
rep_ctl | HDCP_SHA1_TEXT_32);
|
2020-08-18 11:38:49 -04:00
|
|
|
sha_text |= bstatus[0] << 8 | bstatus[1];
|
2018-01-08 14:55:39 -05:00
|
|
|
ret = intel_write_sha_text(dev_priv, sha_text);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
sha_idx += sizeof(sha_text);
|
|
|
|
|
|
|
|
|
|
/* Write 64 bits of M0 */
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_REP_CTL,
|
|
|
|
|
rep_ctl | HDCP_SHA1_TEXT_0);
|
2018-01-08 14:55:39 -05:00
|
|
|
for (i = 0; i < 2; i++) {
|
|
|
|
|
ret = intel_write_sha_text(dev_priv, 0);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
sha_idx += sizeof(sha_text);
|
|
|
|
|
}
|
2020-08-18 11:38:49 -04:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Terminate the SHA-1 stream by hand. For the other leftover
|
|
|
|
|
* cases this is appended by the hardware.
|
|
|
|
|
*/
|
|
|
|
|
intel_de_write(dev_priv, HDCP_REP_CTL,
|
|
|
|
|
rep_ctl | HDCP_SHA1_TEXT_32);
|
|
|
|
|
sha_text = DRM_HDCP_SHA1_TERMINATOR << 24;
|
|
|
|
|
ret = intel_write_sha_text(dev_priv, sha_text);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
sha_idx += sizeof(sha_text);
|
2018-01-08 14:55:39 -05:00
|
|
|
} else if (sha_leftovers == 3) {
|
2020-08-18 11:38:49 -04:00
|
|
|
/* Write 32 bits of text (filled from LSB) */
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_REP_CTL,
|
|
|
|
|
rep_ctl | HDCP_SHA1_TEXT_32);
|
2020-08-18 11:38:49 -04:00
|
|
|
sha_text |= bstatus[0];
|
2018-01-08 14:55:39 -05:00
|
|
|
ret = intel_write_sha_text(dev_priv, sha_text);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
sha_idx += sizeof(sha_text);
|
|
|
|
|
|
2020-08-18 11:38:49 -04:00
|
|
|
/* Write 8 bits of text (filled from LSB), 24 bits of M0 */
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_REP_CTL,
|
|
|
|
|
rep_ctl | HDCP_SHA1_TEXT_8);
|
2018-01-08 14:55:39 -05:00
|
|
|
ret = intel_write_sha_text(dev_priv, bstatus[1]);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
sha_idx += sizeof(sha_text);
|
|
|
|
|
|
|
|
|
|
/* Write 32 bits of M0 */
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_REP_CTL,
|
|
|
|
|
rep_ctl | HDCP_SHA1_TEXT_0);
|
2018-01-08 14:55:39 -05:00
|
|
|
ret = intel_write_sha_text(dev_priv, 0);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
sha_idx += sizeof(sha_text);
|
|
|
|
|
|
|
|
|
|
/* Write 8 bits of M0 */
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_REP_CTL,
|
|
|
|
|
rep_ctl | HDCP_SHA1_TEXT_24);
|
2018-01-08 14:55:39 -05:00
|
|
|
ret = intel_write_sha_text(dev_priv, 0);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
sha_idx += sizeof(sha_text);
|
|
|
|
|
} else {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&dev_priv->drm, "Invalid number of leftovers %d\n",
|
|
|
|
|
sha_leftovers);
|
2018-01-08 14:55:39 -05:00
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_REP_CTL, rep_ctl | HDCP_SHA1_TEXT_32);
|
2018-01-08 14:55:39 -05:00
|
|
|
/* Fill up to 64-4 bytes with zeros (leave the last write for length) */
|
|
|
|
|
while ((sha_idx % 64) < (64 - sizeof(sha_text))) {
|
|
|
|
|
ret = intel_write_sha_text(dev_priv, 0);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
sha_idx += sizeof(sha_text);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Last write gets the length of the concatenation in bits. That is:
|
|
|
|
|
* - 5 bytes per device
|
|
|
|
|
* - 10 bytes for BINFO/BSTATUS(2), M0(8)
|
|
|
|
|
*/
|
|
|
|
|
sha_text = (num_downstream * 5 + 10) * 8;
|
|
|
|
|
ret = intel_write_sha_text(dev_priv, sha_text);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
/* Tell the HW we're done with the hash and wait for it to ACK */
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_REP_CTL,
|
|
|
|
|
rep_ctl | HDCP_SHA1_COMPLETE_HASH);
|
2019-08-15 18:23:43 -07:00
|
|
|
if (intel_de_wait_for_set(dev_priv, HDCP_REP_CTL,
|
|
|
|
|
HDCP_SHA1_COMPLETE, 1)) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_err(&dev_priv->drm, "Timed out waiting for SHA1 complete\n");
|
2018-01-08 14:55:39 -05:00
|
|
|
return -ETIMEDOUT;
|
|
|
|
|
}
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
if (!(intel_de_read(dev_priv, HDCP_REP_CTL) & HDCP_SHA1_V_MATCH)) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&dev_priv->drm, "SHA-1 mismatch, HDCP failed\n");
|
2018-01-08 14:55:39 -05:00
|
|
|
return -ENXIO;
|
|
|
|
|
}
|
|
|
|
|
|
2018-04-02 15:40:32 +05:30
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Implements Part 2 of the HDCP authorization procedure */
|
|
|
|
|
static
|
2019-05-07 21:57:39 +05:30
|
|
|
int intel_hdcp_auth_downstream(struct intel_connector *connector)
|
2018-04-02 15:40:32 +05:30
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2019-12-04 20:05:49 +02:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2019-05-07 21:57:39 +05:30
|
|
|
const struct intel_hdcp_shim *shim = connector->hdcp.shim;
|
2018-04-02 15:40:32 +05:30
|
|
|
u8 bstatus[2], num_downstream, *ksv_fifo;
|
|
|
|
|
int ret, i, tries = 3;
|
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = intel_hdcp_poll_ksv_fifo(dig_port, shim);
|
2018-04-02 15:40:32 +05:30
|
|
|
if (ret) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
|
"KSV list failed to become ready (%d)\n", ret);
|
2018-04-02 15:40:32 +05:30
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = shim->read_bstatus(dig_port, bstatus);
|
2018-04-02 15:40:32 +05:30
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
if (DRM_HDCP_MAX_DEVICE_EXCEEDED(bstatus[0]) ||
|
|
|
|
|
DRM_HDCP_MAX_CASCADE_EXCEEDED(bstatus[1])) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&dev_priv->drm, "Max Topology Limit Exceeded\n");
|
2018-04-02 15:40:32 +05:30
|
|
|
return -EPERM;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* When repeater reports 0 device count, HDCP1.4 spec allows disabling
|
|
|
|
|
* the HDCP encryption. That implies that repeater can't have its own
|
|
|
|
|
* display. As there is no consumption of encrypted content in the
|
|
|
|
|
* repeater with 0 downstream devices, we are failing the
|
|
|
|
|
* authentication.
|
|
|
|
|
*/
|
|
|
|
|
num_downstream = DRM_HDCP_NUM_DOWNSTREAM(bstatus[0]);
|
2019-07-08 17:03:19 +05:30
|
|
|
if (num_downstream == 0) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
|
"Repeater with zero downstream devices\n");
|
2018-04-02 15:40:32 +05:30
|
|
|
return -EINVAL;
|
2019-07-08 17:03:19 +05:30
|
|
|
}
|
2018-04-02 15:40:32 +05:30
|
|
|
|
treewide: kzalloc() -> kcalloc()
The kzalloc() function has a 2-factor argument form, kcalloc(). This
patch replaces cases of:
kzalloc(a * b, gfp)
with:
kcalloc(a * b, gfp)
as well as handling cases of:
kzalloc(a * b * c, gfp)
with:
kzalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kzalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kzalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kzalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kzalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kzalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kzalloc
+ kcalloc
(
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
kzalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
kzalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kzalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
kzalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
kzalloc(C1 * C2 * C3, ...)
|
kzalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
kzalloc(sizeof(THING) * C2, ...)
|
kzalloc(sizeof(TYPE) * C2, ...)
|
kzalloc(C1 * C2 * C3, ...)
|
kzalloc(C1 * C2, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- (E1) * E2
+ E1, E2
, ...)
|
- kzalloc
+ kcalloc
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kzalloc
+ kcalloc
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-12 14:03:40 -07:00
|
|
|
ksv_fifo = kcalloc(DRM_HDCP_KSV_LEN, num_downstream, GFP_KERNEL);
|
2019-07-08 17:03:19 +05:30
|
|
|
if (!ksv_fifo) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&dev_priv->drm, "Out of mem: ksv_fifo\n");
|
2018-04-02 15:40:32 +05:30
|
|
|
return -ENOMEM;
|
2019-07-08 17:03:19 +05:30
|
|
|
}
|
2018-04-02 15:40:32 +05:30
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = shim->read_ksv_fifo(dig_port, num_downstream, ksv_fifo);
|
2018-04-02 15:40:32 +05:30
|
|
|
if (ret)
|
2018-04-04 15:59:57 -07:00
|
|
|
goto err;
|
2018-04-02 15:40:32 +05:30
|
|
|
|
2019-12-04 20:05:49 +02:00
|
|
|
if (drm_hdcp_check_ksvs_revoked(&dev_priv->drm, ksv_fifo,
|
2020-04-29 19:15:55 +05:30
|
|
|
num_downstream) > 0) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_err(&dev_priv->drm, "Revoked Ksv(s) in ksv_fifo\n");
|
2019-07-04 10:45:34 +00:00
|
|
|
ret = -EPERM;
|
|
|
|
|
goto err;
|
2019-05-07 21:57:39 +05:30
|
|
|
}
|
|
|
|
|
|
2018-04-02 15:40:32 +05:30
|
|
|
/*
|
|
|
|
|
* When V prime mismatches, DP Spec mandates re-read of
|
|
|
|
|
* V prime atleast twice.
|
|
|
|
|
*/
|
|
|
|
|
for (i = 0; i < tries; i++) {
|
2019-08-28 22:12:16 +05:30
|
|
|
ret = intel_hdcp_validate_v_prime(connector, shim,
|
2018-04-02 15:40:32 +05:30
|
|
|
ksv_fifo, num_downstream,
|
|
|
|
|
bstatus);
|
|
|
|
|
if (!ret)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (i == tries) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
|
"V Prime validation failed.(%d)\n", ret);
|
2018-04-04 15:59:57 -07:00
|
|
|
goto err;
|
2018-04-02 15:40:32 +05:30
|
|
|
}
|
|
|
|
|
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&dev_priv->drm, "HDCP is enabled (%d downstream devices)\n",
|
|
|
|
|
num_downstream);
|
2018-04-04 15:59:57 -07:00
|
|
|
ret = 0;
|
|
|
|
|
err:
|
|
|
|
|
kfree(ksv_fifo);
|
|
|
|
|
return ret;
|
2018-01-08 14:55:39 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Implements Part 1 of the HDCP authorization procedure */
|
2019-05-07 21:57:39 +05:30
|
|
|
static int intel_hdcp_auth(struct intel_connector *connector)
|
2018-01-08 14:55:39 -05:00
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2019-12-04 20:05:49 +02:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2019-05-07 21:57:39 +05:30
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
|
|
|
|
const struct intel_hdcp_shim *shim = hdcp->shim;
|
2019-08-28 22:12:16 +05:30
|
|
|
enum transcoder cpu_transcoder = connector->hdcp.cpu_transcoder;
|
2020-06-30 21:50:54 -07:00
|
|
|
enum port port = dig_port->base.port;
|
2018-01-08 14:55:39 -05:00
|
|
|
unsigned long r0_prime_gen_start;
|
2018-02-05 23:02:02 +05:30
|
|
|
int ret, i, tries = 2;
|
2018-01-08 14:55:39 -05:00
|
|
|
union {
|
|
|
|
|
u32 reg[2];
|
|
|
|
|
u8 shim[DRM_HDCP_AN_LEN];
|
|
|
|
|
} an;
|
|
|
|
|
union {
|
|
|
|
|
u32 reg[2];
|
|
|
|
|
u8 shim[DRM_HDCP_KSV_LEN];
|
|
|
|
|
} bksv;
|
|
|
|
|
union {
|
|
|
|
|
u32 reg;
|
|
|
|
|
u8 shim[DRM_HDCP_RI_LEN];
|
|
|
|
|
} ri;
|
2018-02-03 03:39:08 +05:30
|
|
|
bool repeater_present, hdcp_capable;
|
2018-01-08 14:55:39 -05:00
|
|
|
|
2018-02-03 03:39:08 +05:30
|
|
|
/*
|
|
|
|
|
* Detects whether the display is HDCP capable. Although we check for
|
|
|
|
|
* valid Bksv below, the HDCP over DP spec requires that we check
|
|
|
|
|
* whether the display supports HDCP before we write An. For HDMI
|
|
|
|
|
* displays, this is not necessary.
|
|
|
|
|
*/
|
|
|
|
|
if (shim->hdcp_capable) {
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = shim->hdcp_capable(dig_port, &hdcp_capable);
|
2018-02-03 03:39:08 +05:30
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
if (!hdcp_capable) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
|
"Panel is not HDCP capable\n");
|
2018-02-03 03:39:08 +05:30
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-08 14:55:39 -05:00
|
|
|
/* Initialize An with 2 random values and acquire it */
|
|
|
|
|
for (i = 0; i < 2; i++)
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv,
|
|
|
|
|
HDCP_ANINIT(dev_priv, cpu_transcoder, port),
|
|
|
|
|
get_random_u32());
|
|
|
|
|
intel_de_write(dev_priv, HDCP_CONF(dev_priv, cpu_transcoder, port),
|
|
|
|
|
HDCP_CONF_CAPTURE_AN);
|
2018-01-08 14:55:39 -05:00
|
|
|
|
|
|
|
|
/* Wait for An to be acquired */
|
2019-08-28 22:12:16 +05:30
|
|
|
if (intel_de_wait_for_set(dev_priv,
|
|
|
|
|
HDCP_STATUS(dev_priv, cpu_transcoder, port),
|
2019-08-15 18:23:43 -07:00
|
|
|
HDCP_STATUS_AN_READY, 1)) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_err(&dev_priv->drm, "Timed out waiting for An\n");
|
2018-01-08 14:55:39 -05:00
|
|
|
return -ETIMEDOUT;
|
|
|
|
|
}
|
|
|
|
|
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
an.reg[0] = intel_de_read(dev_priv,
|
|
|
|
|
HDCP_ANLO(dev_priv, cpu_transcoder, port));
|
|
|
|
|
an.reg[1] = intel_de_read(dev_priv,
|
|
|
|
|
HDCP_ANHI(dev_priv, cpu_transcoder, port));
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = shim->write_an_aksv(dig_port, an.shim);
|
2018-01-08 14:55:39 -05:00
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
r0_prime_gen_start = jiffies;
|
|
|
|
|
|
|
|
|
|
memset(&bksv, 0, sizeof(bksv));
|
2018-02-05 23:02:02 +05:30
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = intel_hdcp_read_valid_bksv(dig_port, shim, bksv.shim);
|
2018-10-23 14:52:27 +05:30
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
2018-01-08 14:55:39 -05:00
|
|
|
|
2020-04-29 19:15:55 +05:30
|
|
|
if (drm_hdcp_check_ksvs_revoked(&dev_priv->drm, bksv.shim, 1) > 0) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_err(&dev_priv->drm, "BKSV is revoked\n");
|
2019-05-07 21:57:39 +05:30
|
|
|
return -EPERM;
|
|
|
|
|
}
|
|
|
|
|
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_BKSVLO(dev_priv, cpu_transcoder, port),
|
|
|
|
|
bksv.reg[0]);
|
|
|
|
|
intel_de_write(dev_priv, HDCP_BKSVHI(dev_priv, cpu_transcoder, port),
|
|
|
|
|
bksv.reg[1]);
|
2018-01-08 14:55:39 -05:00
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = shim->repeater_present(dig_port, &repeater_present);
|
2018-01-08 14:55:39 -05:00
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
if (repeater_present)
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_REP_CTL,
|
|
|
|
|
intel_hdcp_get_repeater_ctl(dev_priv, cpu_transcoder, port));
|
2018-01-08 14:55:39 -05:00
|
|
|
|
2020-08-18 11:38:53 -04:00
|
|
|
ret = shim->toggle_signalling(dig_port, cpu_transcoder, true);
|
2018-01-08 14:55:39 -05:00
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
|
|
|
|
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_CONF(dev_priv, cpu_transcoder, port),
|
|
|
|
|
HDCP_CONF_AUTH_AND_ENC);
|
2018-01-08 14:55:39 -05:00
|
|
|
|
|
|
|
|
/* Wait for R0 ready */
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
if (wait_for(intel_de_read(dev_priv, HDCP_STATUS(dev_priv, cpu_transcoder, port)) &
|
2018-01-08 14:55:39 -05:00
|
|
|
(HDCP_STATUS_R0_READY | HDCP_STATUS_ENC), 1)) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_err(&dev_priv->drm, "Timed out waiting for R0 ready\n");
|
2018-01-08 14:55:39 -05:00
|
|
|
return -ETIMEDOUT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Wait for R0' to become available. The spec says 100ms from Aksv, but
|
|
|
|
|
* some monitors can take longer than this. We'll set the timeout at
|
|
|
|
|
* 300ms just to be sure.
|
|
|
|
|
*
|
|
|
|
|
* On DP, there's an R0_READY bit available but no such bit
|
|
|
|
|
* exists on HDMI. Since the upper-bound is the same, we'll just do
|
|
|
|
|
* the stupid thing instead of polling on one and not the other.
|
|
|
|
|
*/
|
|
|
|
|
wait_remaining_ms_from_jiffies(r0_prime_gen_start, 300);
|
|
|
|
|
|
2018-04-02 17:20:22 +05:30
|
|
|
tries = 3;
|
2018-01-08 14:55:39 -05:00
|
|
|
|
2018-04-02 17:20:22 +05:30
|
|
|
/*
|
|
|
|
|
* DP HDCP Spec mandates the two more reattempt to read R0, incase
|
|
|
|
|
* of R0 mismatch.
|
|
|
|
|
*/
|
|
|
|
|
for (i = 0; i < tries; i++) {
|
|
|
|
|
ri.reg = 0;
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = shim->read_ri_prime(dig_port, ri.shim);
|
2018-04-02 17:20:22 +05:30
|
|
|
if (ret)
|
|
|
|
|
return ret;
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv,
|
|
|
|
|
HDCP_RPRIME(dev_priv, cpu_transcoder, port),
|
|
|
|
|
ri.reg);
|
2018-04-02 17:20:22 +05:30
|
|
|
|
|
|
|
|
/* Wait for Ri prime match */
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
if (!wait_for(intel_de_read(dev_priv, HDCP_STATUS(dev_priv, cpu_transcoder, port)) &
|
|
|
|
|
(HDCP_STATUS_RI_MATCH | HDCP_STATUS_ENC), 1))
|
2018-04-02 17:20:22 +05:30
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (i == tries) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
|
"Timed out waiting for Ri prime match (%x)\n",
|
|
|
|
|
intel_de_read(dev_priv, HDCP_STATUS(dev_priv,
|
|
|
|
|
cpu_transcoder, port)));
|
2018-01-08 14:55:39 -05:00
|
|
|
return -ETIMEDOUT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Wait for encryption confirmation */
|
2019-08-28 22:12:16 +05:30
|
|
|
if (intel_de_wait_for_set(dev_priv,
|
|
|
|
|
HDCP_STATUS(dev_priv, cpu_transcoder, port),
|
2019-08-15 18:23:43 -07:00
|
|
|
HDCP_STATUS_ENC,
|
2021-01-11 13:41:07 +05:30
|
|
|
HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS)) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_err(&dev_priv->drm, "Timed out waiting for encryption\n");
|
2018-01-08 14:55:39 -05:00
|
|
|
return -ETIMEDOUT;
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-11 13:41:09 +05:30
|
|
|
/* DP MST Auth Part 1 Step 2.a and Step 2.b */
|
|
|
|
|
if (shim->stream_encryption) {
|
|
|
|
|
ret = shim->stream_encryption(connector, true);
|
|
|
|
|
if (ret) {
|
|
|
|
|
drm_err(&dev_priv->drm, "[%s:%d] Failed to enable HDCP 1.4 stream enc\n",
|
|
|
|
|
connector->base.name, connector->base.base.id);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
drm_dbg_kms(&dev_priv->drm, "HDCP 1.4 transcoder: %s stream encrypted\n",
|
|
|
|
|
transcoder_name(hdcp->stream_transcoder));
|
|
|
|
|
}
|
2018-01-08 14:55:39 -05:00
|
|
|
|
2018-01-18 11:18:06 +05:30
|
|
|
if (repeater_present)
|
2019-05-07 21:57:39 +05:30
|
|
|
return intel_hdcp_auth_downstream(connector);
|
2018-01-18 11:18:06 +05:30
|
|
|
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&dev_priv->drm, "HDCP is enabled (no repeater present)\n");
|
2018-01-18 11:18:06 +05:30
|
|
|
return 0;
|
2018-01-08 14:55:39 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int _intel_hdcp_disable(struct intel_connector *connector)
|
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2019-12-04 20:05:49 +02:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
2020-06-30 21:50:54 -07:00
|
|
|
enum port port = dig_port->base.port;
|
2019-08-28 22:12:16 +05:30
|
|
|
enum transcoder cpu_transcoder = hdcp->cpu_transcoder;
|
2020-08-18 11:38:50 -04:00
|
|
|
u32 repeater_ctl;
|
2018-01-08 14:55:39 -05:00
|
|
|
int ret;
|
|
|
|
|
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "[%s:%d] HDCP is being disabled...\n",
|
|
|
|
|
connector->base.name, connector->base.base.id);
|
2018-02-03 03:39:05 +05:30
|
|
|
|
2021-01-11 13:41:09 +05:30
|
|
|
if (hdcp->shim->stream_encryption) {
|
|
|
|
|
ret = hdcp->shim->stream_encryption(connector, false);
|
|
|
|
|
if (ret) {
|
|
|
|
|
drm_err(&dev_priv->drm, "[%s:%d] Failed to disable HDCP 1.4 stream enc\n",
|
|
|
|
|
connector->base.name, connector->base.base.id);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
drm_dbg_kms(&dev_priv->drm, "HDCP 1.4 transcoder: %s stream encryption disabled\n",
|
|
|
|
|
transcoder_name(hdcp->stream_transcoder));
|
2021-01-20 16:00:32 +05:30
|
|
|
/*
|
|
|
|
|
* If there are other connectors on this port using HDCP,
|
|
|
|
|
* don't disable it until it disabled HDCP encryption for
|
|
|
|
|
* all connectors in MST topology.
|
|
|
|
|
*/
|
|
|
|
|
if (dig_port->num_hdcp_streams > 0)
|
|
|
|
|
return 0;
|
2021-01-11 13:41:09 +05:30
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:52 +05:30
|
|
|
hdcp->hdcp_encrypted = false;
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP_CONF(dev_priv, cpu_transcoder, port), 0);
|
2019-08-28 22:12:16 +05:30
|
|
|
if (intel_de_wait_for_clear(dev_priv,
|
|
|
|
|
HDCP_STATUS(dev_priv, cpu_transcoder, port),
|
2021-01-11 13:41:07 +05:30
|
|
|
~0, HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS)) {
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_err(&dev_priv->drm,
|
|
|
|
|
"Failed to disable HDCP, timeout clearing status\n");
|
2018-01-08 14:55:39 -05:00
|
|
|
return -ETIMEDOUT;
|
|
|
|
|
}
|
|
|
|
|
|
2020-08-18 11:38:50 -04:00
|
|
|
repeater_ctl = intel_hdcp_get_repeater_ctl(dev_priv, cpu_transcoder,
|
|
|
|
|
port);
|
|
|
|
|
intel_de_write(dev_priv, HDCP_REP_CTL,
|
|
|
|
|
intel_de_read(dev_priv, HDCP_REP_CTL) & ~repeater_ctl);
|
|
|
|
|
|
2020-08-18 11:38:53 -04:00
|
|
|
ret = hdcp->shim->toggle_signalling(dig_port, cpu_transcoder, false);
|
2018-01-08 14:55:39 -05:00
|
|
|
if (ret) {
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_err(&dev_priv->drm, "Failed to disable HDCP signalling\n");
|
2018-01-08 14:55:39 -05:00
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "HDCP is disabled\n");
|
2018-01-08 14:55:39 -05:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int _intel_hdcp_enable(struct intel_connector *connector)
|
|
|
|
|
{
|
2019-12-04 20:05:49 +02:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2018-10-29 15:15:46 +05:30
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
2018-02-03 03:39:09 +05:30
|
|
|
int i, ret, tries = 3;
|
2018-01-08 14:55:39 -05:00
|
|
|
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "[%s:%d] HDCP is being enabled...\n",
|
|
|
|
|
connector->base.name, connector->base.base.id);
|
2018-02-03 03:39:05 +05:30
|
|
|
|
2018-04-02 15:40:33 +05:30
|
|
|
if (!hdcp_key_loadable(dev_priv)) {
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_err(&dev_priv->drm, "HDCP key Load is not possible\n");
|
2018-01-08 14:55:39 -05:00
|
|
|
return -ENXIO;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < KEY_LOAD_TRIES; i++) {
|
|
|
|
|
ret = intel_hdcp_load_keys(dev_priv);
|
|
|
|
|
if (!ret)
|
|
|
|
|
break;
|
|
|
|
|
intel_hdcp_clear_keys(dev_priv);
|
|
|
|
|
}
|
|
|
|
|
if (ret) {
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_err(&dev_priv->drm, "Could not load HDCP keys, (%d)\n",
|
|
|
|
|
ret);
|
2018-01-08 14:55:39 -05:00
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2018-02-03 03:39:09 +05:30
|
|
|
/* Incase of authentication failures, HDCP spec expects reauth. */
|
|
|
|
|
for (i = 0; i < tries; i++) {
|
2019-05-07 21:57:39 +05:30
|
|
|
ret = intel_hdcp_auth(connector);
|
2019-02-16 23:06:52 +05:30
|
|
|
if (!ret) {
|
|
|
|
|
hdcp->hdcp_encrypted = true;
|
2018-02-03 03:39:09 +05:30
|
|
|
return 0;
|
2019-02-16 23:06:52 +05:30
|
|
|
}
|
2018-02-03 03:39:09 +05:30
|
|
|
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "HDCP Auth failure (%d)\n", ret);
|
2018-02-03 03:39:03 +05:30
|
|
|
|
|
|
|
|
/* Ensuring HDCP encryption and signalling are stopped. */
|
|
|
|
|
_intel_hdcp_disable(connector);
|
2018-01-08 14:55:39 -05:00
|
|
|
}
|
|
|
|
|
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
|
"HDCP authentication failed (%d tries/%d)\n", tries, ret);
|
2018-02-03 03:39:09 +05:30
|
|
|
return ret;
|
2018-01-08 14:55:39 -05:00
|
|
|
}
|
|
|
|
|
|
2020-04-20 17:04:38 +03:00
|
|
|
static struct intel_connector *intel_hdcp_to_connector(struct intel_hdcp *hdcp)
|
2018-10-29 15:15:46 +05:30
|
|
|
{
|
|
|
|
|
return container_of(hdcp, struct intel_connector, hdcp);
|
|
|
|
|
}
|
|
|
|
|
|
2020-08-18 11:38:54 -04:00
|
|
|
static void intel_hdcp_update_value(struct intel_connector *connector,
|
|
|
|
|
u64 value, bool update_property)
|
|
|
|
|
{
|
2020-08-18 11:38:57 -04:00
|
|
|
struct drm_device *dev = connector->base.dev;
|
|
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2020-08-18 11:38:54 -04:00
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
|
|
|
|
|
|
|
|
|
drm_WARN_ON(connector->base.dev, !mutex_is_locked(&hdcp->mutex));
|
|
|
|
|
|
|
|
|
|
if (hdcp->value == value)
|
|
|
|
|
return;
|
|
|
|
|
|
2020-08-18 11:38:57 -04:00
|
|
|
drm_WARN_ON(dev, !mutex_is_locked(&dig_port->hdcp_mutex));
|
|
|
|
|
|
|
|
|
|
if (hdcp->value == DRM_MODE_CONTENT_PROTECTION_ENABLED) {
|
|
|
|
|
if (!drm_WARN_ON(dev, dig_port->num_hdcp_streams == 0))
|
|
|
|
|
dig_port->num_hdcp_streams--;
|
|
|
|
|
} else if (value == DRM_MODE_CONTENT_PROTECTION_ENABLED) {
|
|
|
|
|
dig_port->num_hdcp_streams++;
|
|
|
|
|
}
|
|
|
|
|
|
2020-08-18 11:38:54 -04:00
|
|
|
hdcp->value = value;
|
2020-08-18 11:38:55 -04:00
|
|
|
if (update_property) {
|
|
|
|
|
drm_connector_get(&connector->base);
|
2020-08-18 11:38:54 -04:00
|
|
|
schedule_work(&hdcp->prop_work);
|
2020-08-18 11:38:55 -04:00
|
|
|
}
|
2020-08-18 11:38:54 -04:00
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:48 +05:30
|
|
|
/* Implements Part 3 of the HDCP authorization procedure */
|
2019-02-21 08:48:33 +00:00
|
|
|
static int intel_hdcp_check_link(struct intel_connector *connector)
|
2019-02-16 23:06:48 +05:30
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2019-12-04 20:05:49 +02:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
2020-06-30 21:50:54 -07:00
|
|
|
enum port port = dig_port->base.port;
|
2019-08-28 22:12:16 +05:30
|
|
|
enum transcoder cpu_transcoder;
|
2019-02-16 23:06:48 +05:30
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
|
|
mutex_lock(&hdcp->mutex);
|
2020-08-18 11:38:57 -04:00
|
|
|
mutex_lock(&dig_port->hdcp_mutex);
|
|
|
|
|
|
2019-08-28 22:12:16 +05:30
|
|
|
cpu_transcoder = hdcp->cpu_transcoder;
|
2019-02-16 23:06:48 +05:30
|
|
|
|
2019-02-16 23:06:52 +05:30
|
|
|
/* Check_link valid only when HDCP1.4 is enabled */
|
|
|
|
|
if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_ENABLED ||
|
|
|
|
|
!hdcp->hdcp_encrypted) {
|
|
|
|
|
ret = -EINVAL;
|
2019-02-16 23:06:48 +05:30
|
|
|
goto out;
|
2019-02-16 23:06:52 +05:30
|
|
|
}
|
2019-02-16 23:06:48 +05:30
|
|
|
|
drm/i915/display/hdcp: Make WARN* drm specific where drm_priv ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_i915_private struct pointer is
readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule2@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-7-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 22:25:05 +05:30
|
|
|
if (drm_WARN_ON(&dev_priv->drm,
|
|
|
|
|
!intel_hdcp_in_use(dev_priv, cpu_transcoder, port))) {
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_err(&dev_priv->drm,
|
|
|
|
|
"%s:%d HDCP link stopped encryption,%x\n",
|
|
|
|
|
connector->base.name, connector->base.base.id,
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_read(dev_priv, HDCP_STATUS(dev_priv, cpu_transcoder, port)));
|
2019-02-16 23:06:48 +05:30
|
|
|
ret = -ENXIO;
|
2020-08-18 11:38:54 -04:00
|
|
|
intel_hdcp_update_value(connector,
|
|
|
|
|
DRM_MODE_CONTENT_PROTECTION_DESIRED,
|
|
|
|
|
true);
|
2019-02-16 23:06:48 +05:30
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
2020-08-18 11:39:02 -04:00
|
|
|
if (hdcp->shim->check_link(dig_port, connector)) {
|
2019-02-16 23:06:48 +05:30
|
|
|
if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {
|
2020-08-18 11:38:54 -04:00
|
|
|
intel_hdcp_update_value(connector,
|
|
|
|
|
DRM_MODE_CONTENT_PROTECTION_ENABLED, true);
|
2019-02-16 23:06:48 +05:30
|
|
|
}
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
|
"[%s:%d] HDCP link failed, retrying authentication\n",
|
|
|
|
|
connector->base.name, connector->base.base.id);
|
2019-02-16 23:06:48 +05:30
|
|
|
|
|
|
|
|
ret = _intel_hdcp_disable(connector);
|
|
|
|
|
if (ret) {
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_err(&dev_priv->drm, "Failed to disable hdcp (%d)\n", ret);
|
2020-08-18 11:38:54 -04:00
|
|
|
intel_hdcp_update_value(connector,
|
|
|
|
|
DRM_MODE_CONTENT_PROTECTION_DESIRED,
|
|
|
|
|
true);
|
2019-02-16 23:06:48 +05:30
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = _intel_hdcp_enable(connector);
|
|
|
|
|
if (ret) {
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_err(&dev_priv->drm, "Failed to enable hdcp (%d)\n", ret);
|
2020-08-18 11:38:54 -04:00
|
|
|
intel_hdcp_update_value(connector,
|
|
|
|
|
DRM_MODE_CONTENT_PROTECTION_DESIRED,
|
|
|
|
|
true);
|
2019-02-16 23:06:48 +05:30
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
out:
|
2020-08-18 11:38:57 -04:00
|
|
|
mutex_unlock(&dig_port->hdcp_mutex);
|
2019-02-16 23:06:48 +05:30
|
|
|
mutex_unlock(&hdcp->mutex);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-08 14:55:39 -05:00
|
|
|
static void intel_hdcp_prop_work(struct work_struct *work)
|
|
|
|
|
{
|
2018-10-29 15:15:46 +05:30
|
|
|
struct intel_hdcp *hdcp = container_of(work, struct intel_hdcp,
|
|
|
|
|
prop_work);
|
|
|
|
|
struct intel_connector *connector = intel_hdcp_to_connector(hdcp);
|
2019-12-04 20:05:49 +02:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2018-01-08 14:55:39 -05:00
|
|
|
|
2019-12-04 20:05:49 +02:00
|
|
|
drm_modeset_lock(&dev_priv->drm.mode_config.connection_mutex, NULL);
|
2018-10-29 15:15:46 +05:30
|
|
|
mutex_lock(&hdcp->mutex);
|
2018-01-08 14:55:39 -05:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* This worker is only used to flip between ENABLED/DESIRED. Either of
|
2018-10-29 15:15:46 +05:30
|
|
|
* those to UNDESIRED is handled by core. If value == UNDESIRED,
|
2018-01-08 14:55:39 -05:00
|
|
|
* we're running just after hdcp has been disabled, so just exit
|
|
|
|
|
*/
|
2019-08-01 17:11:18 +05:30
|
|
|
if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED)
|
|
|
|
|
drm_hdcp_update_content_protection(&connector->base,
|
|
|
|
|
hdcp->value);
|
2018-01-08 14:55:39 -05:00
|
|
|
|
2018-10-29 15:15:46 +05:30
|
|
|
mutex_unlock(&hdcp->mutex);
|
2019-12-04 20:05:49 +02:00
|
|
|
drm_modeset_unlock(&dev_priv->drm.mode_config.connection_mutex);
|
2020-08-18 11:38:55 -04:00
|
|
|
|
|
|
|
|
drm_connector_put(&connector->base);
|
2018-01-08 14:55:39 -05:00
|
|
|
}
|
|
|
|
|
|
2018-01-18 11:18:05 +05:30
|
|
|
bool is_hdcp_supported(struct drm_i915_private *dev_priv, enum port port)
|
|
|
|
|
{
|
2022-08-19 15:02:45 +03:00
|
|
|
return RUNTIME_INFO(dev_priv)->has_hdcp &&
|
|
|
|
|
(DISPLAY_VER(dev_priv) >= 12 || port < PORT_E);
|
2018-01-18 11:18:05 +05:30
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:54 +05:30
|
|
|
static int
|
2019-02-16 23:06:51 +05:30
|
|
|
hdcp2_prepare_ake_init(struct intel_connector *connector,
|
|
|
|
|
struct hdcp2_ake_init *ake_data)
|
|
|
|
|
{
|
2021-01-11 13:41:12 +05:30
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
|
|
|
|
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
|
2019-02-16 23:06:51 +05:30
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
|
struct i915_hdcp_comp_master *comp;
|
|
|
|
|
int ret;
|
|
|
|
|
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
|
|
|
|
|
comp = dev_priv->display.hdcp.master;
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
if (!comp || !comp->ops) {
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = comp->ops->initiate_hdcp2_session(comp->mei_dev, data, ake_data);
|
|
|
|
|
if (ret)
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "Prepare_ake_init failed. %d\n",
|
|
|
|
|
ret);
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:54 +05:30
|
|
|
static int
|
2019-02-16 23:06:51 +05:30
|
|
|
hdcp2_verify_rx_cert_prepare_km(struct intel_connector *connector,
|
|
|
|
|
struct hdcp2_ake_send_cert *rx_cert,
|
|
|
|
|
bool *paired,
|
|
|
|
|
struct hdcp2_ake_no_stored_km *ek_pub_km,
|
|
|
|
|
size_t *msg_sz)
|
|
|
|
|
{
|
2021-01-11 13:41:12 +05:30
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
|
|
|
|
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
|
2019-02-16 23:06:51 +05:30
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
|
struct i915_hdcp_comp_master *comp;
|
|
|
|
|
int ret;
|
|
|
|
|
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
|
|
|
|
|
comp = dev_priv->display.hdcp.master;
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
if (!comp || !comp->ops) {
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = comp->ops->verify_receiver_cert_prepare_km(comp->mei_dev, data,
|
|
|
|
|
rx_cert, paired,
|
|
|
|
|
ek_pub_km, msg_sz);
|
|
|
|
|
if (ret < 0)
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "Verify rx_cert failed. %d\n",
|
|
|
|
|
ret);
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:54 +05:30
|
|
|
static int hdcp2_verify_hprime(struct intel_connector *connector,
|
|
|
|
|
struct hdcp2_ake_send_hprime *rx_hprime)
|
2019-02-16 23:06:51 +05:30
|
|
|
{
|
2021-01-11 13:41:12 +05:30
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
|
|
|
|
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
|
2019-02-16 23:06:51 +05:30
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
|
struct i915_hdcp_comp_master *comp;
|
|
|
|
|
int ret;
|
|
|
|
|
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
|
|
|
|
|
comp = dev_priv->display.hdcp.master;
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
if (!comp || !comp->ops) {
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = comp->ops->verify_hprime(comp->mei_dev, data, rx_hprime);
|
|
|
|
|
if (ret < 0)
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "Verify hprime failed. %d\n", ret);
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:54 +05:30
|
|
|
static int
|
2019-02-16 23:06:51 +05:30
|
|
|
hdcp2_store_pairing_info(struct intel_connector *connector,
|
|
|
|
|
struct hdcp2_ake_send_pairing_info *pairing_info)
|
|
|
|
|
{
|
2021-01-11 13:41:12 +05:30
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
|
|
|
|
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
|
2019-02-16 23:06:51 +05:30
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
|
struct i915_hdcp_comp_master *comp;
|
|
|
|
|
int ret;
|
|
|
|
|
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
|
|
|
|
|
comp = dev_priv->display.hdcp.master;
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
if (!comp || !comp->ops) {
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = comp->ops->store_pairing_info(comp->mei_dev, data, pairing_info);
|
|
|
|
|
if (ret < 0)
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "Store pairing info failed. %d\n",
|
|
|
|
|
ret);
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:54 +05:30
|
|
|
static int
|
2019-02-16 23:06:51 +05:30
|
|
|
hdcp2_prepare_lc_init(struct intel_connector *connector,
|
|
|
|
|
struct hdcp2_lc_init *lc_init)
|
|
|
|
|
{
|
2021-01-11 13:41:12 +05:30
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
|
|
|
|
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
|
2019-02-16 23:06:51 +05:30
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
|
struct i915_hdcp_comp_master *comp;
|
|
|
|
|
int ret;
|
|
|
|
|
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
|
|
|
|
|
comp = dev_priv->display.hdcp.master;
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
if (!comp || !comp->ops) {
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = comp->ops->initiate_locality_check(comp->mei_dev, data, lc_init);
|
|
|
|
|
if (ret < 0)
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "Prepare lc_init failed. %d\n",
|
|
|
|
|
ret);
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:54 +05:30
|
|
|
static int
|
2019-02-16 23:06:51 +05:30
|
|
|
hdcp2_verify_lprime(struct intel_connector *connector,
|
|
|
|
|
struct hdcp2_lc_send_lprime *rx_lprime)
|
|
|
|
|
{
|
2021-01-11 13:41:12 +05:30
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
|
|
|
|
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
|
2019-02-16 23:06:51 +05:30
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
|
struct i915_hdcp_comp_master *comp;
|
|
|
|
|
int ret;
|
|
|
|
|
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
|
|
|
|
|
comp = dev_priv->display.hdcp.master;
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
if (!comp || !comp->ops) {
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = comp->ops->verify_lprime(comp->mei_dev, data, rx_lprime);
|
|
|
|
|
if (ret < 0)
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "Verify L_Prime failed. %d\n",
|
|
|
|
|
ret);
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:54 +05:30
|
|
|
static int hdcp2_prepare_skey(struct intel_connector *connector,
|
|
|
|
|
struct hdcp2_ske_send_eks *ske_data)
|
2019-02-16 23:06:51 +05:30
|
|
|
{
|
2021-01-11 13:41:12 +05:30
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
|
|
|
|
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
|
2019-02-16 23:06:51 +05:30
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
|
struct i915_hdcp_comp_master *comp;
|
|
|
|
|
int ret;
|
|
|
|
|
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
|
|
|
|
|
comp = dev_priv->display.hdcp.master;
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
if (!comp || !comp->ops) {
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = comp->ops->get_session_key(comp->mei_dev, data, ske_data);
|
|
|
|
|
if (ret < 0)
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "Get session key failed. %d\n",
|
|
|
|
|
ret);
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:55 +05:30
|
|
|
static int
|
2019-02-16 23:06:51 +05:30
|
|
|
hdcp2_verify_rep_topology_prepare_ack(struct intel_connector *connector,
|
|
|
|
|
struct hdcp2_rep_send_receiverid_list
|
|
|
|
|
*rep_topology,
|
|
|
|
|
struct hdcp2_rep_send_ack *rep_send_ack)
|
|
|
|
|
{
|
2021-01-11 13:41:12 +05:30
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
|
|
|
|
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
|
2019-02-16 23:06:51 +05:30
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
|
struct i915_hdcp_comp_master *comp;
|
|
|
|
|
int ret;
|
|
|
|
|
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
|
|
|
|
|
comp = dev_priv->display.hdcp.master;
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
if (!comp || !comp->ops) {
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = comp->ops->repeater_check_flow_prepare_ack(comp->mei_dev, data,
|
|
|
|
|
rep_topology,
|
|
|
|
|
rep_send_ack);
|
|
|
|
|
if (ret < 0)
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
|
"Verify rep topology failed. %d\n", ret);
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:55 +05:30
|
|
|
static int
|
2019-02-16 23:06:51 +05:30
|
|
|
hdcp2_verify_mprime(struct intel_connector *connector,
|
|
|
|
|
struct hdcp2_rep_stream_ready *stream_ready)
|
|
|
|
|
{
|
2021-01-11 13:41:12 +05:30
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
|
|
|
|
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
|
2019-02-16 23:06:51 +05:30
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
|
struct i915_hdcp_comp_master *comp;
|
|
|
|
|
int ret;
|
|
|
|
|
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
|
|
|
|
|
comp = dev_priv->display.hdcp.master;
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
if (!comp || !comp->ops) {
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = comp->ops->verify_mprime(comp->mei_dev, data, stream_ready);
|
|
|
|
|
if (ret < 0)
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "Verify mprime failed. %d\n", ret);
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:54 +05:30
|
|
|
static int hdcp2_authenticate_port(struct intel_connector *connector)
|
2019-02-16 23:06:51 +05:30
|
|
|
{
|
2021-01-11 13:41:12 +05:30
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
|
|
|
|
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
|
2019-02-16 23:06:51 +05:30
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
|
struct i915_hdcp_comp_master *comp;
|
|
|
|
|
int ret;
|
|
|
|
|
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
|
|
|
|
|
comp = dev_priv->display.hdcp.master;
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
if (!comp || !comp->ops) {
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = comp->ops->enable_hdcp_authentication(comp->mei_dev, data);
|
|
|
|
|
if (ret < 0)
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "Enable hdcp auth failed. %d\n",
|
|
|
|
|
ret);
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:53 +05:30
|
|
|
static int hdcp2_close_mei_session(struct intel_connector *connector)
|
2019-02-16 23:06:51 +05:30
|
|
|
{
|
2021-01-11 13:41:12 +05:30
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2019-02-16 23:06:51 +05:30
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
|
struct i915_hdcp_comp_master *comp;
|
|
|
|
|
int ret;
|
|
|
|
|
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
|
|
|
|
|
comp = dev_priv->display.hdcp.master;
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
if (!comp || !comp->ops) {
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = comp->ops->close_hdcp_session(comp->mei_dev,
|
2021-01-11 13:41:12 +05:30
|
|
|
&dig_port->hdcp_port_data);
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:53 +05:30
|
|
|
static int hdcp2_deauthenticate_port(struct intel_connector *connector)
|
2019-02-16 23:06:51 +05:30
|
|
|
{
|
|
|
|
|
return hdcp2_close_mei_session(connector);
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:54 +05:30
|
|
|
/* Authentication flow starts from here */
|
|
|
|
|
static int hdcp2_authentication_key_exchange(struct intel_connector *connector)
|
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2019-12-04 20:05:49 +02:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2019-02-16 23:06:54 +05:30
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
|
|
|
|
union {
|
|
|
|
|
struct hdcp2_ake_init ake_init;
|
|
|
|
|
struct hdcp2_ake_send_cert send_cert;
|
|
|
|
|
struct hdcp2_ake_no_stored_km no_stored_km;
|
|
|
|
|
struct hdcp2_ake_send_hprime send_hprime;
|
|
|
|
|
struct hdcp2_ake_send_pairing_info pairing_info;
|
|
|
|
|
} msgs;
|
|
|
|
|
const struct intel_hdcp_shim *shim = hdcp->shim;
|
|
|
|
|
size_t size;
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
/* Init for seq_num */
|
|
|
|
|
hdcp->seq_num_v = 0;
|
|
|
|
|
hdcp->seq_num_m = 0;
|
|
|
|
|
|
|
|
|
|
ret = hdcp2_prepare_ake_init(connector, &msgs.ake_init);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = shim->write_2_2_msg(dig_port, &msgs.ake_init,
|
2019-02-16 23:06:54 +05:30
|
|
|
sizeof(msgs.ake_init));
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = shim->read_2_2_msg(dig_port, HDCP_2_2_AKE_SEND_CERT,
|
2019-02-16 23:06:54 +05:30
|
|
|
&msgs.send_cert, sizeof(msgs.send_cert));
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2019-07-08 17:03:19 +05:30
|
|
|
if (msgs.send_cert.rx_caps[0] != HDCP_2_2_RX_CAPS_VERSION_VAL) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&dev_priv->drm, "cert.rx_caps dont claim HDCP2.2\n");
|
2019-02-16 23:06:54 +05:30
|
|
|
return -EINVAL;
|
2019-07-08 17:03:19 +05:30
|
|
|
}
|
2019-02-16 23:06:54 +05:30
|
|
|
|
|
|
|
|
hdcp->is_repeater = HDCP_2_2_RX_REPEATER(msgs.send_cert.rx_caps[2]);
|
|
|
|
|
|
2019-12-04 20:05:49 +02:00
|
|
|
if (drm_hdcp_check_ksvs_revoked(&dev_priv->drm,
|
|
|
|
|
msgs.send_cert.cert_rx.receiver_id,
|
2020-04-29 19:15:55 +05:30
|
|
|
1) > 0) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_err(&dev_priv->drm, "Receiver ID is revoked\n");
|
2019-05-07 21:57:39 +05:30
|
|
|
return -EPERM;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:54 +05:30
|
|
|
/*
|
|
|
|
|
* Here msgs.no_stored_km will hold msgs corresponding to the km
|
|
|
|
|
* stored also.
|
|
|
|
|
*/
|
|
|
|
|
ret = hdcp2_verify_rx_cert_prepare_km(connector, &msgs.send_cert,
|
|
|
|
|
&hdcp->is_paired,
|
|
|
|
|
&msgs.no_stored_km, &size);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = shim->write_2_2_msg(dig_port, &msgs.no_stored_km, size);
|
2019-02-16 23:06:54 +05:30
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = shim->read_2_2_msg(dig_port, HDCP_2_2_AKE_SEND_HPRIME,
|
2019-02-16 23:06:54 +05:30
|
|
|
&msgs.send_hprime, sizeof(msgs.send_hprime));
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
ret = hdcp2_verify_hprime(connector, &msgs.send_hprime);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
if (!hdcp->is_paired) {
|
|
|
|
|
/* Pairing is required */
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = shim->read_2_2_msg(dig_port,
|
2019-02-16 23:06:54 +05:30
|
|
|
HDCP_2_2_AKE_SEND_PAIRING_INFO,
|
|
|
|
|
&msgs.pairing_info,
|
|
|
|
|
sizeof(msgs.pairing_info));
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
ret = hdcp2_store_pairing_info(connector, &msgs.pairing_info);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
hdcp->is_paired = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int hdcp2_locality_check(struct intel_connector *connector)
|
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2019-02-16 23:06:54 +05:30
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
|
|
|
|
union {
|
|
|
|
|
struct hdcp2_lc_init lc_init;
|
|
|
|
|
struct hdcp2_lc_send_lprime send_lprime;
|
|
|
|
|
} msgs;
|
|
|
|
|
const struct intel_hdcp_shim *shim = hdcp->shim;
|
|
|
|
|
int tries = HDCP2_LC_RETRY_CNT, ret, i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < tries; i++) {
|
|
|
|
|
ret = hdcp2_prepare_lc_init(connector, &msgs.lc_init);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
continue;
|
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = shim->write_2_2_msg(dig_port, &msgs.lc_init,
|
2019-02-16 23:06:54 +05:30
|
|
|
sizeof(msgs.lc_init));
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
continue;
|
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = shim->read_2_2_msg(dig_port,
|
2019-02-16 23:06:54 +05:30
|
|
|
HDCP_2_2_LC_SEND_LPRIME,
|
|
|
|
|
&msgs.send_lprime,
|
|
|
|
|
sizeof(msgs.send_lprime));
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
ret = hdcp2_verify_lprime(connector, &msgs.send_lprime);
|
|
|
|
|
if (!ret)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int hdcp2_session_key_exchange(struct intel_connector *connector)
|
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2019-02-16 23:06:54 +05:30
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
|
|
|
|
struct hdcp2_ske_send_eks send_eks;
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
ret = hdcp2_prepare_skey(connector, &send_eks);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = hdcp->shim->write_2_2_msg(dig_port, &send_eks,
|
2019-02-16 23:06:54 +05:30
|
|
|
sizeof(send_eks));
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:55 +05:30
|
|
|
static
|
2020-09-23 18:54:34 +05:30
|
|
|
int _hdcp2_propagate_stream_management_info(struct intel_connector *connector)
|
2019-02-16 23:06:55 +05:30
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2021-01-11 13:41:15 +05:30
|
|
|
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
|
2019-02-16 23:06:55 +05:30
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
|
|
|
|
union {
|
|
|
|
|
struct hdcp2_rep_stream_manage stream_manage;
|
|
|
|
|
struct hdcp2_rep_stream_ready stream_ready;
|
|
|
|
|
} msgs;
|
|
|
|
|
const struct intel_hdcp_shim *shim = hdcp->shim;
|
2021-01-11 13:41:15 +05:30
|
|
|
int ret, streams_size_delta, i;
|
2019-02-16 23:06:55 +05:30
|
|
|
|
2020-09-23 18:54:35 +05:30
|
|
|
if (connector->hdcp.seq_num_m > HDCP_2_2_SEQ_NUM_MAX)
|
|
|
|
|
return -ERANGE;
|
|
|
|
|
|
2019-02-16 23:06:55 +05:30
|
|
|
/* Prepare RepeaterAuth_Stream_Manage msg */
|
|
|
|
|
msgs.stream_manage.msg_id = HDCP_2_2_REP_STREAM_MANAGE;
|
2019-05-07 21:57:37 +05:30
|
|
|
drm_hdcp_cpu_to_be24(msgs.stream_manage.seq_num_m, hdcp->seq_num_m);
|
2019-02-16 23:06:55 +05:30
|
|
|
|
2021-01-11 13:41:15 +05:30
|
|
|
msgs.stream_manage.k = cpu_to_be16(data->k);
|
2019-02-16 23:06:55 +05:30
|
|
|
|
2021-01-11 13:41:15 +05:30
|
|
|
for (i = 0; i < data->k; i++) {
|
|
|
|
|
msgs.stream_manage.streams[i].stream_id = data->streams[i].stream_id;
|
|
|
|
|
msgs.stream_manage.streams[i].stream_type = data->streams[i].stream_type;
|
|
|
|
|
}
|
2019-02-16 23:06:55 +05:30
|
|
|
|
2021-01-11 13:41:15 +05:30
|
|
|
streams_size_delta = (HDCP_2_2_MAX_CONTENT_STREAMS_CNT - data->k) *
|
|
|
|
|
sizeof(struct hdcp2_streamid_type);
|
2019-02-16 23:06:55 +05:30
|
|
|
/* Send it to Repeater */
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = shim->write_2_2_msg(dig_port, &msgs.stream_manage,
|
2021-01-11 13:41:15 +05:30
|
|
|
sizeof(msgs.stream_manage) - streams_size_delta);
|
2019-02-16 23:06:55 +05:30
|
|
|
if (ret < 0)
|
2020-09-23 18:54:34 +05:30
|
|
|
goto out;
|
2019-02-16 23:06:55 +05:30
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = shim->read_2_2_msg(dig_port, HDCP_2_2_REP_STREAM_READY,
|
2019-02-16 23:06:55 +05:30
|
|
|
&msgs.stream_ready, sizeof(msgs.stream_ready));
|
|
|
|
|
if (ret < 0)
|
2020-09-23 18:54:34 +05:30
|
|
|
goto out;
|
2019-02-16 23:06:55 +05:30
|
|
|
|
2021-01-11 13:41:15 +05:30
|
|
|
data->seq_num_m = hdcp->seq_num_m;
|
2021-01-11 13:41:12 +05:30
|
|
|
|
2019-02-16 23:06:55 +05:30
|
|
|
ret = hdcp2_verify_mprime(connector, &msgs.stream_ready);
|
|
|
|
|
|
2020-09-23 18:54:34 +05:30
|
|
|
out:
|
2019-02-16 23:06:55 +05:30
|
|
|
hdcp->seq_num_m++;
|
|
|
|
|
|
2020-09-23 18:54:34 +05:30
|
|
|
return ret;
|
2019-02-16 23:06:55 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static
|
|
|
|
|
int hdcp2_authenticate_repeater_topology(struct intel_connector *connector)
|
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2019-12-04 20:05:49 +02:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2019-02-16 23:06:55 +05:30
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
|
|
|
|
union {
|
|
|
|
|
struct hdcp2_rep_send_receiverid_list recvid_list;
|
|
|
|
|
struct hdcp2_rep_send_ack rep_ack;
|
|
|
|
|
} msgs;
|
|
|
|
|
const struct intel_hdcp_shim *shim = hdcp->shim;
|
2019-05-07 21:57:39 +05:30
|
|
|
u32 seq_num_v, device_cnt;
|
2019-02-16 23:06:55 +05:30
|
|
|
u8 *rx_info;
|
|
|
|
|
int ret;
|
|
|
|
|
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = shim->read_2_2_msg(dig_port, HDCP_2_2_REP_SEND_RECVID_LIST,
|
2019-02-16 23:06:55 +05:30
|
|
|
&msgs.recvid_list, sizeof(msgs.recvid_list));
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
rx_info = msgs.recvid_list.rx_info;
|
|
|
|
|
|
|
|
|
|
if (HDCP_2_2_MAX_CASCADE_EXCEEDED(rx_info[1]) ||
|
|
|
|
|
HDCP_2_2_MAX_DEVS_EXCEEDED(rx_info[1])) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&dev_priv->drm, "Topology Max Size Exceeded\n");
|
2019-02-16 23:06:55 +05:30
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
2021-08-19 11:48:35 -07:00
|
|
|
/*
|
|
|
|
|
* MST topology is not Type 1 capable if it contains a downstream
|
|
|
|
|
* device that is only HDCP 1.x or Legacy HDCP 2.0/2.1 compliant.
|
|
|
|
|
*/
|
|
|
|
|
dig_port->hdcp_mst_type1_capable =
|
|
|
|
|
!HDCP_2_2_HDCP1_DEVICE_CONNECTED(rx_info[1]) &&
|
|
|
|
|
!HDCP_2_2_HDCP_2_0_REP_CONNECTED(rx_info[1]);
|
|
|
|
|
|
2019-02-16 23:06:55 +05:30
|
|
|
/* Converting and Storing the seq_num_v to local variable as DWORD */
|
2019-05-07 21:57:37 +05:30
|
|
|
seq_num_v =
|
|
|
|
|
drm_hdcp_be24_to_cpu((const u8 *)msgs.recvid_list.seq_num_v);
|
2019-02-16 23:06:55 +05:30
|
|
|
|
2020-02-20 18:02:16 +05:30
|
|
|
if (!hdcp->hdcp2_encrypted && seq_num_v) {
|
|
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
|
"Non zero Seq_num_v at first RecvId_List msg\n");
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:55 +05:30
|
|
|
if (seq_num_v < hdcp->seq_num_v) {
|
|
|
|
|
/* Roll over of the seq_num_v from repeater. Reauthenticate. */
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&dev_priv->drm, "Seq_num_v roll over.\n");
|
2019-02-16 23:06:55 +05:30
|
|
|
return -EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
2019-05-17 11:22:25 +01:00
|
|
|
device_cnt = (HDCP_2_2_DEV_COUNT_HI(rx_info[0]) << 4 |
|
|
|
|
|
HDCP_2_2_DEV_COUNT_LO(rx_info[1]));
|
2019-12-04 20:05:49 +02:00
|
|
|
if (drm_hdcp_check_ksvs_revoked(&dev_priv->drm,
|
|
|
|
|
msgs.recvid_list.receiver_ids,
|
2020-04-29 19:15:55 +05:30
|
|
|
device_cnt) > 0) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_err(&dev_priv->drm, "Revoked receiver ID(s) is in list\n");
|
2019-05-07 21:57:39 +05:30
|
|
|
return -EPERM;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:55 +05:30
|
|
|
ret = hdcp2_verify_rep_topology_prepare_ack(connector,
|
|
|
|
|
&msgs.recvid_list,
|
|
|
|
|
&msgs.rep_ack);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
hdcp->seq_num_v = seq_num_v;
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = shim->write_2_2_msg(dig_port, &msgs.rep_ack,
|
2019-02-16 23:06:55 +05:30
|
|
|
sizeof(msgs.rep_ack));
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:53 +05:30
|
|
|
static int hdcp2_authenticate_sink(struct intel_connector *connector)
|
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2020-02-12 18:00:07 +05:30
|
|
|
struct drm_i915_private *i915 = to_i915(connector->base.dev);
|
2019-02-16 23:06:54 +05:30
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
|
|
|
|
const struct intel_hdcp_shim *shim = hdcp->shim;
|
|
|
|
|
int ret;
|
2019-02-16 23:06:53 +05:30
|
|
|
|
2019-02-16 23:06:54 +05:30
|
|
|
ret = hdcp2_authentication_key_exchange(connector);
|
|
|
|
|
if (ret < 0) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&i915->drm, "AKE Failed. Err : %d\n", ret);
|
2019-02-16 23:06:54 +05:30
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = hdcp2_locality_check(connector);
|
|
|
|
|
if (ret < 0) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&i915->drm,
|
|
|
|
|
"Locality Check failed. Err : %d\n", ret);
|
2019-02-16 23:06:54 +05:30
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = hdcp2_session_key_exchange(connector);
|
|
|
|
|
if (ret < 0) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&i915->drm, "SKE Failed. Err : %d\n", ret);
|
2019-02-16 23:06:54 +05:30
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (shim->config_stream_type) {
|
2020-06-30 21:50:54 -07:00
|
|
|
ret = shim->config_stream_type(dig_port,
|
2019-02-16 23:06:54 +05:30
|
|
|
hdcp->is_repeater,
|
|
|
|
|
hdcp->content_type);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:55 +05:30
|
|
|
if (hdcp->is_repeater) {
|
2020-09-23 18:54:34 +05:30
|
|
|
ret = hdcp2_authenticate_repeater_topology(connector);
|
2019-02-16 23:06:55 +05:30
|
|
|
if (ret < 0) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&i915->drm,
|
|
|
|
|
"Repeater Auth Failed. Err: %d\n", ret);
|
2019-02-16 23:06:55 +05:30
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:54 +05:30
|
|
|
return ret;
|
2019-02-16 23:06:53 +05:30
|
|
|
}
|
|
|
|
|
|
2021-01-11 13:41:19 +05:30
|
|
|
static int hdcp2_enable_stream_encryption(struct intel_connector *connector)
|
|
|
|
|
{
|
|
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2021-03-19 15:32:07 +05:30
|
|
|
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
|
2021-01-11 13:41:19 +05:30
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
|
|
|
|
enum transcoder cpu_transcoder = hdcp->cpu_transcoder;
|
|
|
|
|
enum port port = dig_port->base.port;
|
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
|
|
if (!(intel_de_read(dev_priv, HDCP2_STATUS(dev_priv, cpu_transcoder, port)) &
|
|
|
|
|
LINK_ENCRYPTION_STATUS)) {
|
|
|
|
|
drm_err(&dev_priv->drm, "[%s:%d] HDCP 2.2 Link is not encrypted\n",
|
|
|
|
|
connector->base.name, connector->base.base.id);
|
2021-03-19 15:32:07 +05:30
|
|
|
ret = -EPERM;
|
|
|
|
|
goto link_recover;
|
2021-01-11 13:41:19 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (hdcp->shim->stream_2_2_encryption) {
|
|
|
|
|
ret = hdcp->shim->stream_2_2_encryption(connector, true);
|
|
|
|
|
if (ret) {
|
|
|
|
|
drm_err(&dev_priv->drm, "[%s:%d] Failed to enable HDCP 2.2 stream enc\n",
|
|
|
|
|
connector->base.name, connector->base.base.id);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
drm_dbg_kms(&dev_priv->drm, "HDCP 2.2 transcoder: %s stream encrypted\n",
|
|
|
|
|
transcoder_name(hdcp->stream_transcoder));
|
|
|
|
|
}
|
|
|
|
|
|
2021-03-19 15:32:07 +05:30
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
link_recover:
|
|
|
|
|
if (hdcp2_deauthenticate_port(connector) < 0)
|
|
|
|
|
drm_dbg_kms(&dev_priv->drm, "Port deauth failed.\n");
|
|
|
|
|
|
|
|
|
|
dig_port->hdcp_auth_status = false;
|
|
|
|
|
data->k = 0;
|
|
|
|
|
|
2021-01-11 13:41:19 +05:30
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:53 +05:30
|
|
|
static int hdcp2_enable_encryption(struct intel_connector *connector)
|
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2019-02-16 23:06:53 +05:30
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
2020-06-30 21:50:54 -07:00
|
|
|
enum port port = dig_port->base.port;
|
2019-08-28 22:12:16 +05:30
|
|
|
enum transcoder cpu_transcoder = hdcp->cpu_transcoder;
|
2019-02-16 23:06:53 +05:30
|
|
|
int ret;
|
|
|
|
|
|
drm/i915/display/hdcp: Make WARN* drm specific where drm_priv ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_i915_private struct pointer is
readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule2@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-7-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 22:25:05 +05:30
|
|
|
drm_WARN_ON(&dev_priv->drm,
|
|
|
|
|
intel_de_read(dev_priv, HDCP2_STATUS(dev_priv, cpu_transcoder, port)) &
|
|
|
|
|
LINK_ENCRYPTION_STATUS);
|
2019-02-16 23:06:53 +05:30
|
|
|
if (hdcp->shim->toggle_signalling) {
|
2020-08-18 11:38:53 -04:00
|
|
|
ret = hdcp->shim->toggle_signalling(dig_port, cpu_transcoder,
|
|
|
|
|
true);
|
2019-02-16 23:06:53 +05:30
|
|
|
if (ret) {
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_err(&dev_priv->drm,
|
|
|
|
|
"Failed to enable HDCP signalling. %d\n",
|
|
|
|
|
ret);
|
2019-02-16 23:06:53 +05:30
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
if (intel_de_read(dev_priv, HDCP2_STATUS(dev_priv, cpu_transcoder, port)) &
|
2019-08-28 22:12:16 +05:30
|
|
|
LINK_AUTH_STATUS) {
|
2019-02-16 23:06:53 +05:30
|
|
|
/* Link is Authenticated. Now set for Encryption */
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv,
|
|
|
|
|
HDCP2_CTL(dev_priv, cpu_transcoder, port),
|
|
|
|
|
intel_de_read(dev_priv, HDCP2_CTL(dev_priv, cpu_transcoder, port)) | CTL_LINK_ENCRYPTION_REQ);
|
2019-02-16 23:06:53 +05:30
|
|
|
}
|
|
|
|
|
|
2019-08-28 22:12:16 +05:30
|
|
|
ret = intel_de_wait_for_set(dev_priv,
|
|
|
|
|
HDCP2_STATUS(dev_priv, cpu_transcoder,
|
|
|
|
|
port),
|
2019-08-15 18:23:43 -07:00
|
|
|
LINK_ENCRYPTION_STATUS,
|
2021-01-11 13:41:07 +05:30
|
|
|
HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS);
|
2021-01-11 13:41:15 +05:30
|
|
|
dig_port->hdcp_auth_status = true;
|
2019-02-16 23:06:53 +05:30
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int hdcp2_disable_encryption(struct intel_connector *connector)
|
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2019-02-16 23:06:53 +05:30
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
2020-06-30 21:50:54 -07:00
|
|
|
enum port port = dig_port->base.port;
|
2019-08-28 22:12:16 +05:30
|
|
|
enum transcoder cpu_transcoder = hdcp->cpu_transcoder;
|
2019-02-16 23:06:53 +05:30
|
|
|
int ret;
|
|
|
|
|
|
drm/i915/display/hdcp: Make WARN* drm specific where drm_priv ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_i915_private struct pointer is
readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule2@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-7-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 22:25:05 +05:30
|
|
|
drm_WARN_ON(&dev_priv->drm, !(intel_de_read(dev_priv, HDCP2_STATUS(dev_priv, cpu_transcoder, port)) &
|
|
|
|
|
LINK_ENCRYPTION_STATUS));
|
2019-02-16 23:06:53 +05:30
|
|
|
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_write(dev_priv, HDCP2_CTL(dev_priv, cpu_transcoder, port),
|
|
|
|
|
intel_de_read(dev_priv, HDCP2_CTL(dev_priv, cpu_transcoder, port)) & ~CTL_LINK_ENCRYPTION_REQ);
|
2019-02-16 23:06:53 +05:30
|
|
|
|
2019-08-28 22:12:16 +05:30
|
|
|
ret = intel_de_wait_for_clear(dev_priv,
|
|
|
|
|
HDCP2_STATUS(dev_priv, cpu_transcoder,
|
|
|
|
|
port),
|
2019-08-15 18:23:43 -07:00
|
|
|
LINK_ENCRYPTION_STATUS,
|
2021-01-11 13:41:07 +05:30
|
|
|
HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS);
|
2019-02-16 23:06:53 +05:30
|
|
|
if (ret == -ETIMEDOUT)
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "Disable Encryption Timedout");
|
2019-02-16 23:06:53 +05:30
|
|
|
|
|
|
|
|
if (hdcp->shim->toggle_signalling) {
|
2020-08-18 11:38:53 -04:00
|
|
|
ret = hdcp->shim->toggle_signalling(dig_port, cpu_transcoder,
|
|
|
|
|
false);
|
2019-02-16 23:06:53 +05:30
|
|
|
if (ret) {
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_err(&dev_priv->drm,
|
|
|
|
|
"Failed to disable HDCP signalling. %d\n",
|
|
|
|
|
ret);
|
2019-02-16 23:06:53 +05:30
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-23 18:54:34 +05:30
|
|
|
static int
|
|
|
|
|
hdcp2_propagate_stream_management_info(struct intel_connector *connector)
|
|
|
|
|
{
|
|
|
|
|
struct drm_i915_private *i915 = to_i915(connector->base.dev);
|
|
|
|
|
int i, tries = 3, ret;
|
|
|
|
|
|
|
|
|
|
if (!connector->hdcp.is_repeater)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < tries; i++) {
|
|
|
|
|
ret = _hdcp2_propagate_stream_management_info(connector);
|
|
|
|
|
if (!ret)
|
|
|
|
|
break;
|
|
|
|
|
|
2020-09-23 18:54:35 +05:30
|
|
|
/* Lets restart the auth incase of seq_num_m roll over */
|
|
|
|
|
if (connector->hdcp.seq_num_m > HDCP_2_2_SEQ_NUM_MAX) {
|
|
|
|
|
drm_dbg_kms(&i915->drm,
|
|
|
|
|
"seq_num_m roll over.(%d)\n", ret);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-23 18:54:34 +05:30
|
|
|
drm_dbg_kms(&i915->drm,
|
|
|
|
|
"HDCP2 stream management %d of %d Failed.(%d)\n",
|
|
|
|
|
i + 1, tries, ret);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:53 +05:30
|
|
|
static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector)
|
|
|
|
|
{
|
2021-01-11 13:41:12 +05:30
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2020-02-12 18:00:07 +05:30
|
|
|
struct drm_i915_private *i915 = to_i915(connector->base.dev);
|
2021-01-11 13:41:15 +05:30
|
|
|
int ret = 0, i, tries = 3;
|
2019-02-16 23:06:53 +05:30
|
|
|
|
2021-01-11 13:41:15 +05:30
|
|
|
for (i = 0; i < tries && !dig_port->hdcp_auth_status; i++) {
|
2019-02-16 23:06:53 +05:30
|
|
|
ret = hdcp2_authenticate_sink(connector);
|
2020-09-23 18:54:34 +05:30
|
|
|
if (!ret) {
|
2021-08-19 11:48:35 -07:00
|
|
|
ret = intel_hdcp_prepare_streams(connector);
|
|
|
|
|
if (ret) {
|
|
|
|
|
drm_dbg_kms(&i915->drm,
|
|
|
|
|
"Prepare streams failed.(%d)\n",
|
|
|
|
|
ret);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2020-09-23 18:54:34 +05:30
|
|
|
ret = hdcp2_propagate_stream_management_info(connector);
|
|
|
|
|
if (ret) {
|
|
|
|
|
drm_dbg_kms(&i915->drm,
|
|
|
|
|
"Stream management failed.(%d)\n",
|
|
|
|
|
ret);
|
|
|
|
|
break;
|
|
|
|
|
}
|
2021-01-11 13:41:15 +05:30
|
|
|
|
2020-09-23 18:54:34 +05:30
|
|
|
ret = hdcp2_authenticate_port(connector);
|
|
|
|
|
if (!ret)
|
|
|
|
|
break;
|
|
|
|
|
drm_dbg_kms(&i915->drm, "HDCP2 port auth failed.(%d)\n",
|
|
|
|
|
ret);
|
|
|
|
|
}
|
2019-02-16 23:06:53 +05:30
|
|
|
|
|
|
|
|
/* Clearing the mei hdcp session */
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&i915->drm, "HDCP2.2 Auth %d of %d Failed.(%d)\n",
|
|
|
|
|
i + 1, tries, ret);
|
2019-02-16 23:06:53 +05:30
|
|
|
if (hdcp2_deauthenticate_port(connector) < 0)
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&i915->drm, "Port deauth failed.\n");
|
2019-02-16 23:06:53 +05:30
|
|
|
}
|
|
|
|
|
|
2021-01-11 13:41:19 +05:30
|
|
|
if (!ret && !dig_port->hdcp_auth_status) {
|
2019-02-16 23:06:53 +05:30
|
|
|
/*
|
|
|
|
|
* Ensuring the required 200mSec min time interval between
|
|
|
|
|
* Session Key Exchange and encryption.
|
|
|
|
|
*/
|
|
|
|
|
msleep(HDCP_2_2_DELAY_BEFORE_ENCRYPTION_EN);
|
|
|
|
|
ret = hdcp2_enable_encryption(connector);
|
|
|
|
|
if (ret < 0) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&i915->drm,
|
|
|
|
|
"Encryption Enable Failed.(%d)\n", ret);
|
2019-02-16 23:06:53 +05:30
|
|
|
if (hdcp2_deauthenticate_port(connector) < 0)
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&i915->drm, "Port deauth failed.\n");
|
2019-02-16 23:06:53 +05:30
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-03-19 15:32:08 +05:30
|
|
|
if (!ret)
|
|
|
|
|
ret = hdcp2_enable_stream_encryption(connector);
|
2021-01-11 13:41:19 +05:30
|
|
|
|
2019-02-16 23:06:53 +05:30
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int _intel_hdcp2_enable(struct intel_connector *connector)
|
|
|
|
|
{
|
2020-02-12 18:00:07 +05:30
|
|
|
struct drm_i915_private *i915 = to_i915(connector->base.dev);
|
2019-02-16 23:06:53 +05:30
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
|
|
|
|
int ret;
|
|
|
|
|
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&i915->drm, "[%s:%d] HDCP2.2 is being enabled. Type: %d\n",
|
|
|
|
|
connector->base.name, connector->base.base.id,
|
|
|
|
|
hdcp->content_type);
|
2019-02-16 23:06:53 +05:30
|
|
|
|
|
|
|
|
ret = hdcp2_authenticate_and_encrypt(connector);
|
|
|
|
|
if (ret) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&i915->drm, "HDCP2 Type%d Enabling Failed. (%d)\n",
|
|
|
|
|
hdcp->content_type, ret);
|
2019-02-16 23:06:53 +05:30
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&i915->drm, "[%s:%d] HDCP2.2 is enabled. Type %d\n",
|
|
|
|
|
connector->base.name, connector->base.base.id,
|
|
|
|
|
hdcp->content_type);
|
2019-02-16 23:06:53 +05:30
|
|
|
|
|
|
|
|
hdcp->hdcp2_encrypted = true;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2021-03-19 15:32:06 +05:30
|
|
|
static int
|
|
|
|
|
_intel_hdcp2_disable(struct intel_connector *connector, bool hdcp2_link_recovery)
|
2019-02-16 23:06:53 +05:30
|
|
|
{
|
2021-01-11 13:41:15 +05:30
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2020-02-12 18:00:07 +05:30
|
|
|
struct drm_i915_private *i915 = to_i915(connector->base.dev);
|
2021-01-11 13:41:15 +05:30
|
|
|
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
|
2021-01-11 13:41:19 +05:30
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
2019-02-16 23:06:53 +05:30
|
|
|
int ret;
|
|
|
|
|
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&i915->drm, "[%s:%d] HDCP2.2 is being Disabled\n",
|
|
|
|
|
connector->base.name, connector->base.base.id);
|
2019-02-16 23:06:53 +05:30
|
|
|
|
2021-01-11 13:41:19 +05:30
|
|
|
if (hdcp->shim->stream_2_2_encryption) {
|
|
|
|
|
ret = hdcp->shim->stream_2_2_encryption(connector, false);
|
|
|
|
|
if (ret) {
|
|
|
|
|
drm_err(&i915->drm, "[%s:%d] Failed to disable HDCP 2.2 stream enc\n",
|
|
|
|
|
connector->base.name, connector->base.base.id);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
drm_dbg_kms(&i915->drm, "HDCP 2.2 transcoder: %s stream encryption disabled\n",
|
|
|
|
|
transcoder_name(hdcp->stream_transcoder));
|
|
|
|
|
|
2021-03-19 15:32:06 +05:30
|
|
|
if (dig_port->num_hdcp_streams > 0 && !hdcp2_link_recovery)
|
2021-01-20 16:00:32 +05:30
|
|
|
return 0;
|
|
|
|
|
}
|
2021-01-11 13:41:19 +05:30
|
|
|
|
2019-02-16 23:06:53 +05:30
|
|
|
ret = hdcp2_disable_encryption(connector);
|
|
|
|
|
|
|
|
|
|
if (hdcp2_deauthenticate_port(connector) < 0)
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&i915->drm, "Port deauth failed.\n");
|
2019-02-16 23:06:53 +05:30
|
|
|
|
|
|
|
|
connector->hdcp.hdcp2_encrypted = false;
|
2021-01-11 13:41:15 +05:30
|
|
|
dig_port->hdcp_auth_status = false;
|
|
|
|
|
data->k = 0;
|
2019-02-16 23:06:53 +05:30
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:57 +05:30
|
|
|
/* Implements the Link Integrity Check for HDCP2.2 */
|
|
|
|
|
static int intel_hdcp2_check_link(struct intel_connector *connector)
|
|
|
|
|
{
|
2020-06-30 21:50:54 -07:00
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2019-02-16 23:06:57 +05:30
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
|
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
2020-06-30 21:50:54 -07:00
|
|
|
enum port port = dig_port->base.port;
|
2019-08-28 22:12:16 +05:30
|
|
|
enum transcoder cpu_transcoder;
|
2019-02-16 23:06:57 +05:30
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
|
|
mutex_lock(&hdcp->mutex);
|
2021-01-11 13:41:19 +05:30
|
|
|
mutex_lock(&dig_port->hdcp_mutex);
|
2019-08-28 22:12:16 +05:30
|
|
|
cpu_transcoder = hdcp->cpu_transcoder;
|
2019-02-16 23:06:57 +05:30
|
|
|
|
|
|
|
|
/* hdcp2_check_link is expected only when HDCP2.2 is Enabled */
|
|
|
|
|
if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_ENABLED ||
|
|
|
|
|
!hdcp->hdcp2_encrypted) {
|
|
|
|
|
ret = -EINVAL;
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
drm/i915/display/hdcp: Make WARN* drm specific where drm_priv ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_i915_private struct pointer is
readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule2@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-7-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 22:25:05 +05:30
|
|
|
if (drm_WARN_ON(&dev_priv->drm,
|
|
|
|
|
!intel_hdcp2_in_use(dev_priv, cpu_transcoder, port))) {
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_err(&dev_priv->drm,
|
|
|
|
|
"HDCP2.2 link stopped the encryption, %x\n",
|
drm/i915/hdcp: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a58f536d25d9cd6da510da49663508cd264eee0f.1580149467.git.jani.nikula@intel.com
2020-01-27 20:26:09 +02:00
|
|
|
intel_de_read(dev_priv, HDCP2_STATUS(dev_priv, cpu_transcoder, port)));
|
2019-02-16 23:06:57 +05:30
|
|
|
ret = -ENXIO;
|
2021-03-19 15:32:06 +05:30
|
|
|
_intel_hdcp2_disable(connector, true);
|
2020-08-18 11:38:54 -04:00
|
|
|
intel_hdcp_update_value(connector,
|
|
|
|
|
DRM_MODE_CONTENT_PROTECTION_DESIRED,
|
|
|
|
|
true);
|
2019-02-16 23:06:57 +05:30
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-11 13:41:16 +05:30
|
|
|
ret = hdcp->shim->check_2_2_link(dig_port, connector);
|
2019-02-16 23:06:57 +05:30
|
|
|
if (ret == HDCP_LINK_PROTECTED) {
|
|
|
|
|
if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {
|
2020-08-18 11:38:54 -04:00
|
|
|
intel_hdcp_update_value(connector,
|
|
|
|
|
DRM_MODE_CONTENT_PROTECTION_ENABLED,
|
|
|
|
|
true);
|
2019-02-16 23:06:57 +05:30
|
|
|
}
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:58 +05:30
|
|
|
if (ret == HDCP_TOPOLOGY_CHANGE) {
|
|
|
|
|
if (hdcp->value == DRM_MODE_CONTENT_PROTECTION_UNDESIRED)
|
|
|
|
|
goto out;
|
|
|
|
|
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
|
"HDCP2.2 Downstream topology change\n");
|
2019-02-16 23:06:58 +05:30
|
|
|
ret = hdcp2_authenticate_repeater_topology(connector);
|
|
|
|
|
if (!ret) {
|
2020-08-18 11:38:54 -04:00
|
|
|
intel_hdcp_update_value(connector,
|
|
|
|
|
DRM_MODE_CONTENT_PROTECTION_ENABLED,
|
|
|
|
|
true);
|
2019-02-16 23:06:58 +05:30
|
|
|
goto out;
|
|
|
|
|
}
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
|
"[%s:%d] Repeater topology auth failed.(%d)\n",
|
|
|
|
|
connector->base.name, connector->base.base.id,
|
|
|
|
|
ret);
|
2019-02-16 23:06:58 +05:30
|
|
|
} else {
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
|
"[%s:%d] HDCP2.2 link failed, retrying auth\n",
|
|
|
|
|
connector->base.name, connector->base.base.id);
|
2019-02-16 23:06:58 +05:30
|
|
|
}
|
2019-02-16 23:06:57 +05:30
|
|
|
|
2021-03-19 15:32:06 +05:30
|
|
|
ret = _intel_hdcp2_disable(connector, true);
|
2019-02-16 23:06:57 +05:30
|
|
|
if (ret) {
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_err(&dev_priv->drm,
|
|
|
|
|
"[%s:%d] Failed to disable hdcp2.2 (%d)\n",
|
|
|
|
|
connector->base.name, connector->base.base.id, ret);
|
2020-08-18 11:38:54 -04:00
|
|
|
intel_hdcp_update_value(connector,
|
|
|
|
|
DRM_MODE_CONTENT_PROTECTION_DESIRED, true);
|
2019-02-16 23:06:57 +05:30
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = _intel_hdcp2_enable(connector);
|
|
|
|
|
if (ret) {
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
|
"[%s:%d] Failed to enable hdcp2.2 (%d)\n",
|
|
|
|
|
connector->base.name, connector->base.base.id,
|
|
|
|
|
ret);
|
2020-08-18 11:38:54 -04:00
|
|
|
intel_hdcp_update_value(connector,
|
|
|
|
|
DRM_MODE_CONTENT_PROTECTION_DESIRED,
|
|
|
|
|
true);
|
2019-02-16 23:06:57 +05:30
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
out:
|
2021-01-11 13:41:19 +05:30
|
|
|
mutex_unlock(&dig_port->hdcp_mutex);
|
2019-02-16 23:06:57 +05:30
|
|
|
mutex_unlock(&hdcp->mutex);
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:52 +05:30
|
|
|
static void intel_hdcp_check_work(struct work_struct *work)
|
|
|
|
|
{
|
|
|
|
|
struct intel_hdcp *hdcp = container_of(to_delayed_work(work),
|
|
|
|
|
struct intel_hdcp,
|
|
|
|
|
check_work);
|
|
|
|
|
struct intel_connector *connector = intel_hdcp_to_connector(hdcp);
|
|
|
|
|
|
2020-08-18 11:38:55 -04:00
|
|
|
if (drm_connector_is_unregistered(&connector->base))
|
|
|
|
|
return;
|
|
|
|
|
|
2019-02-16 23:06:57 +05:30
|
|
|
if (!intel_hdcp2_check_link(connector))
|
|
|
|
|
schedule_delayed_work(&hdcp->check_work,
|
|
|
|
|
DRM_HDCP2_CHECK_PERIOD_MS);
|
|
|
|
|
else if (!intel_hdcp_check_link(connector))
|
2019-02-16 23:06:52 +05:30
|
|
|
schedule_delayed_work(&hdcp->check_work,
|
|
|
|
|
DRM_HDCP_CHECK_PERIOD_MS);
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:51 +05:30
|
|
|
static int i915_hdcp_component_bind(struct device *i915_kdev,
|
|
|
|
|
struct device *mei_kdev, void *data)
|
|
|
|
|
{
|
|
|
|
|
struct drm_i915_private *dev_priv = kdev_to_i915(i915_kdev);
|
|
|
|
|
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg(&dev_priv->drm, "I915 HDCP comp bind\n");
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
|
|
|
|
|
dev_priv->display.hdcp.master = (struct i915_hdcp_comp_master *)data;
|
|
|
|
|
dev_priv->display.hdcp.master->mei_dev = mei_kdev;
|
|
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void i915_hdcp_component_unbind(struct device *i915_kdev,
|
|
|
|
|
struct device *mei_kdev, void *data)
|
|
|
|
|
{
|
|
|
|
|
struct drm_i915_private *dev_priv = kdev_to_i915(i915_kdev);
|
|
|
|
|
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg(&dev_priv->drm, "I915 HDCP comp unbind\n");
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
|
|
|
|
|
dev_priv->display.hdcp.master = NULL;
|
|
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct component_ops i915_hdcp_component_ops = {
|
|
|
|
|
.bind = i915_hdcp_component_bind,
|
|
|
|
|
.unbind = i915_hdcp_component_unbind,
|
|
|
|
|
};
|
|
|
|
|
|
2020-04-20 17:04:38 +03:00
|
|
|
static enum mei_fw_ddi intel_get_mei_fw_ddi_index(enum port port)
|
2019-08-28 22:12:11 +05:30
|
|
|
{
|
|
|
|
|
switch (port) {
|
|
|
|
|
case PORT_A:
|
|
|
|
|
return MEI_DDI_A;
|
|
|
|
|
case PORT_B ... PORT_F:
|
|
|
|
|
return (enum mei_fw_ddi)port;
|
|
|
|
|
default:
|
|
|
|
|
return MEI_DDI_INVALID_PORT;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-20 17:04:38 +03:00
|
|
|
static enum mei_fw_tc intel_get_mei_fw_tc(enum transcoder cpu_transcoder)
|
2019-08-28 22:12:15 +05:30
|
|
|
{
|
|
|
|
|
switch (cpu_transcoder) {
|
|
|
|
|
case TRANSCODER_A ... TRANSCODER_D:
|
|
|
|
|
return (enum mei_fw_tc)(cpu_transcoder | 0x10);
|
|
|
|
|
default: /* eDP, DSI TRANSCODERS are non HDCP capable */
|
|
|
|
|
return MEI_INVALID_TRANSCODER;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-20 17:04:38 +03:00
|
|
|
static int initialize_hdcp_port_data(struct intel_connector *connector,
|
2021-01-11 13:41:11 +05:30
|
|
|
struct intel_digital_port *dig_port,
|
2020-04-20 17:04:38 +03:00
|
|
|
const struct intel_hdcp_shim *shim)
|
2019-02-16 23:06:51 +05:30
|
|
|
{
|
2019-08-28 22:12:15 +05:30
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2021-01-11 13:41:12 +05:30
|
|
|
struct hdcp_port_data *data = &dig_port->hdcp_port_data;
|
2019-02-16 23:06:51 +05:30
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
2021-01-11 13:41:11 +05:30
|
|
|
enum port port = dig_port->base.port;
|
2019-02-16 23:06:51 +05:30
|
|
|
|
2021-03-19 21:42:42 -07:00
|
|
|
if (DISPLAY_VER(dev_priv) < 12)
|
2020-08-18 11:39:01 -04:00
|
|
|
data->fw_ddi = intel_get_mei_fw_ddi_index(port);
|
2019-08-28 22:12:15 +05:30
|
|
|
else
|
|
|
|
|
/*
|
|
|
|
|
* As per ME FW API expectation, for GEN 12+, fw_ddi is filled
|
|
|
|
|
* with zero(INVALID PORT index).
|
|
|
|
|
*/
|
|
|
|
|
data->fw_ddi = MEI_DDI_INVALID_PORT;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* As associated transcoder is set and modified at modeset, here fw_tc
|
|
|
|
|
* is initialized to zero (invalid transcoder index). This will be
|
|
|
|
|
* retained for <Gen12 forever.
|
|
|
|
|
*/
|
|
|
|
|
data->fw_tc = MEI_INVALID_TRANSCODER;
|
|
|
|
|
|
2019-02-16 23:06:51 +05:30
|
|
|
data->port_type = (u8)HDCP_PORT_TYPE_INTEGRATED;
|
2019-08-01 17:11:15 +05:30
|
|
|
data->protocol = (u8)shim->protocol;
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
if (!data->streams)
|
2021-01-11 13:41:12 +05:30
|
|
|
data->streams = kcalloc(INTEL_NUM_PIPES(dev_priv),
|
2019-02-16 23:06:51 +05:30
|
|
|
sizeof(struct hdcp2_streamid_type),
|
|
|
|
|
GFP_KERNEL);
|
|
|
|
|
if (!data->streams) {
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_err(&dev_priv->drm, "Out of Memory\n");
|
2019-02-16 23:06:51 +05:30
|
|
|
return -ENOMEM;
|
|
|
|
|
}
|
2021-01-11 13:41:12 +05:30
|
|
|
/* For SST */
|
2019-02-16 23:06:51 +05:30
|
|
|
data->streams[0].stream_id = 0;
|
|
|
|
|
data->streams[0].stream_type = hdcp->content_type;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:50 +05:30
|
|
|
static bool is_hdcp2_supported(struct drm_i915_private *dev_priv)
|
|
|
|
|
{
|
|
|
|
|
if (!IS_ENABLED(CONFIG_INTEL_MEI_HDCP))
|
|
|
|
|
return false;
|
|
|
|
|
|
2021-03-19 21:42:42 -07:00
|
|
|
return (DISPLAY_VER(dev_priv) >= 10 ||
|
2020-06-02 15:05:40 +01:00
|
|
|
IS_KABYLAKE(dev_priv) ||
|
|
|
|
|
IS_COFFEELAKE(dev_priv) ||
|
|
|
|
|
IS_COMETLAKE(dev_priv));
|
2019-02-16 23:06:50 +05:30
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:51 +05:30
|
|
|
void intel_hdcp_component_init(struct drm_i915_private *dev_priv)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
if (!is_hdcp2_supported(dev_priv))
|
|
|
|
|
return;
|
|
|
|
|
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
|
|
|
|
|
drm_WARN_ON(&dev_priv->drm, dev_priv->display.hdcp.comp_added);
|
2019-02-16 23:06:51 +05:30
|
|
|
|
2022-08-29 16:18:08 +03:00
|
|
|
dev_priv->display.hdcp.comp_added = true;
|
|
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
ret = component_add_typed(dev_priv->drm.dev, &i915_hdcp_component_ops,
|
|
|
|
|
I915_COMPONENT_HDCP);
|
|
|
|
|
if (ret < 0) {
|
drm/i915/hdcp: conversion to struct drm_device based logging macros.
Converts various instances of the printk based logging macros in
i915/display/intel_hdcp.c with the struct drm_device based macros using
coccinelle. The script matches based on the existence of an existing
struct drm_i915_private device:
@rule1@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@rule2@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
New checkpatch warnings were addressed manually.
Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122110844.2022-7-wambui.karugax@gmail.com
2020-01-22 14:08:44 +03:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "Failed at component add(%d)\n",
|
|
|
|
|
ret);
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
|
|
|
|
|
dev_priv->display.hdcp.comp_added = false;
|
|
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-01-11 13:41:11 +05:30
|
|
|
static void intel_hdcp2_init(struct intel_connector *connector,
|
|
|
|
|
struct intel_digital_port *dig_port,
|
2019-08-01 17:11:15 +05:30
|
|
|
const struct intel_hdcp_shim *shim)
|
2019-02-16 23:06:50 +05:30
|
|
|
{
|
2020-02-12 18:00:07 +05:30
|
|
|
struct drm_i915_private *i915 = to_i915(connector->base.dev);
|
2019-02-16 23:06:50 +05:30
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
2019-02-16 23:06:51 +05:30
|
|
|
int ret;
|
|
|
|
|
|
2021-01-11 13:41:11 +05:30
|
|
|
ret = initialize_hdcp_port_data(connector, dig_port, shim);
|
2019-02-16 23:06:51 +05:30
|
|
|
if (ret) {
|
2020-02-12 18:00:07 +05:30
|
|
|
drm_dbg_kms(&i915->drm, "Mei hdcp data init failed\n");
|
2019-02-16 23:06:51 +05:30
|
|
|
return;
|
|
|
|
|
}
|
2019-02-16 23:06:50 +05:30
|
|
|
|
|
|
|
|
hdcp->hdcp2_supported = true;
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-08 14:55:39 -05:00
|
|
|
int intel_hdcp_init(struct intel_connector *connector,
|
2021-01-11 13:41:11 +05:30
|
|
|
struct intel_digital_port *dig_port,
|
2018-10-29 15:15:46 +05:30
|
|
|
const struct intel_hdcp_shim *shim)
|
2018-01-08 14:55:39 -05:00
|
|
|
{
|
2019-02-16 23:06:50 +05:30
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2018-10-29 15:15:46 +05:30
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
2018-01-08 14:55:39 -05:00
|
|
|
int ret;
|
|
|
|
|
|
2019-02-16 23:06:50 +05:30
|
|
|
if (!shim)
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
2021-01-11 13:41:20 +05:30
|
|
|
if (is_hdcp2_supported(dev_priv))
|
2021-01-11 13:41:11 +05:30
|
|
|
intel_hdcp2_init(connector, dig_port, shim);
|
2019-08-01 17:11:15 +05:30
|
|
|
|
2019-08-01 17:11:14 +05:30
|
|
|
ret =
|
|
|
|
|
drm_connector_attach_content_protection_property(&connector->base,
|
2019-08-01 17:11:15 +05:30
|
|
|
hdcp->hdcp2_supported);
|
|
|
|
|
if (ret) {
|
|
|
|
|
hdcp->hdcp2_supported = false;
|
2021-01-11 13:41:12 +05:30
|
|
|
kfree(dig_port->hdcp_port_data.streams);
|
2018-01-08 14:55:39 -05:00
|
|
|
return ret;
|
2019-08-01 17:11:15 +05:30
|
|
|
}
|
2018-01-08 14:55:39 -05:00
|
|
|
|
2018-10-29 15:15:46 +05:30
|
|
|
hdcp->shim = shim;
|
|
|
|
|
mutex_init(&hdcp->mutex);
|
|
|
|
|
INIT_DELAYED_WORK(&hdcp->check_work, intel_hdcp_check_work);
|
|
|
|
|
INIT_WORK(&hdcp->prop_work, intel_hdcp_prop_work);
|
2019-02-16 23:07:02 +05:30
|
|
|
init_waitqueue_head(&hdcp->cp_irq_queue);
|
2019-02-16 23:06:50 +05:30
|
|
|
|
2018-01-08 14:55:39 -05:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2019-12-04 20:05:41 +02:00
|
|
|
int intel_hdcp_enable(struct intel_connector *connector,
|
2021-01-11 13:41:06 +05:30
|
|
|
const struct intel_crtc_state *pipe_config, u8 content_type)
|
2018-01-08 14:55:39 -05:00
|
|
|
{
|
2019-12-04 20:05:41 +02:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
|
2020-08-18 11:38:57 -04:00
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2018-10-29 15:15:46 +05:30
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
2019-02-16 23:06:57 +05:30
|
|
|
unsigned long check_link_interval = DRM_HDCP_CHECK_PERIOD_MS;
|
2019-02-16 23:06:53 +05:30
|
|
|
int ret = -EINVAL;
|
2018-01-08 14:55:39 -05:00
|
|
|
|
2018-10-29 15:15:46 +05:30
|
|
|
if (!hdcp->shim)
|
2018-01-08 14:55:39 -05:00
|
|
|
return -ENOENT;
|
|
|
|
|
|
2021-01-11 13:41:05 +05:30
|
|
|
if (!connector->encoder) {
|
|
|
|
|
drm_err(&dev_priv->drm, "[%s:%d] encoder is not initialized\n",
|
|
|
|
|
connector->base.name, connector->base.base.id);
|
|
|
|
|
return -ENODEV;
|
|
|
|
|
}
|
|
|
|
|
|
2018-10-29 15:15:46 +05:30
|
|
|
mutex_lock(&hdcp->mutex);
|
2020-08-18 11:38:57 -04:00
|
|
|
mutex_lock(&dig_port->hdcp_mutex);
|
drm/i915/display/hdcp: Make WARN* drm specific where drm_priv ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_i915_private struct pointer is
readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule2@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-7-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 22:25:05 +05:30
|
|
|
drm_WARN_ON(&dev_priv->drm,
|
|
|
|
|
hdcp->value == DRM_MODE_CONTENT_PROTECTION_ENABLED);
|
2019-08-01 17:11:15 +05:30
|
|
|
hdcp->content_type = content_type;
|
2021-01-11 13:41:06 +05:30
|
|
|
|
|
|
|
|
if (intel_crtc_has_type(pipe_config, INTEL_OUTPUT_DP_MST)) {
|
|
|
|
|
hdcp->cpu_transcoder = pipe_config->mst_master_transcoder;
|
|
|
|
|
hdcp->stream_transcoder = pipe_config->cpu_transcoder;
|
|
|
|
|
} else {
|
|
|
|
|
hdcp->cpu_transcoder = pipe_config->cpu_transcoder;
|
|
|
|
|
hdcp->stream_transcoder = INVALID_TRANSCODER;
|
|
|
|
|
}
|
2018-01-08 14:55:39 -05:00
|
|
|
|
2021-03-19 21:42:42 -07:00
|
|
|
if (DISPLAY_VER(dev_priv) >= 12)
|
2021-01-11 13:41:12 +05:30
|
|
|
dig_port->hdcp_port_data.fw_tc = intel_get_mei_fw_tc(hdcp->cpu_transcoder);
|
2019-12-04 20:05:41 +02:00
|
|
|
|
2019-02-16 23:06:53 +05:30
|
|
|
/*
|
|
|
|
|
* Considering that HDCP2.2 is more secure than HDCP1.4, If the setup
|
|
|
|
|
* is capable of HDCP2.2, it is preferred to use HDCP2.2.
|
|
|
|
|
*/
|
2019-02-16 23:06:57 +05:30
|
|
|
if (intel_hdcp2_capable(connector)) {
|
2019-02-16 23:06:53 +05:30
|
|
|
ret = _intel_hdcp2_enable(connector);
|
2019-02-16 23:06:57 +05:30
|
|
|
if (!ret)
|
|
|
|
|
check_link_interval = DRM_HDCP2_CHECK_PERIOD_MS;
|
|
|
|
|
}
|
2019-02-16 23:06:53 +05:30
|
|
|
|
2019-08-01 17:11:15 +05:30
|
|
|
/*
|
|
|
|
|
* When HDCP2.2 fails and Content Type is not Type1, HDCP1.4 will
|
|
|
|
|
* be attempted.
|
|
|
|
|
*/
|
|
|
|
|
if (ret && intel_hdcp_capable(connector) &&
|
|
|
|
|
hdcp->content_type != DRM_MODE_HDCP_CONTENT_TYPE1) {
|
2019-02-16 23:06:53 +05:30
|
|
|
ret = _intel_hdcp_enable(connector);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!ret) {
|
2019-02-16 23:06:57 +05:30
|
|
|
schedule_delayed_work(&hdcp->check_work, check_link_interval);
|
2020-08-18 11:38:54 -04:00
|
|
|
intel_hdcp_update_value(connector,
|
|
|
|
|
DRM_MODE_CONTENT_PROTECTION_ENABLED,
|
|
|
|
|
true);
|
2019-02-16 23:06:53 +05:30
|
|
|
}
|
2018-01-08 14:55:39 -05:00
|
|
|
|
2020-08-18 11:38:57 -04:00
|
|
|
mutex_unlock(&dig_port->hdcp_mutex);
|
2018-10-29 15:15:46 +05:30
|
|
|
mutex_unlock(&hdcp->mutex);
|
2018-01-08 14:55:39 -05:00
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int intel_hdcp_disable(struct intel_connector *connector)
|
|
|
|
|
{
|
2020-08-18 11:38:57 -04:00
|
|
|
struct intel_digital_port *dig_port = intel_attached_dig_port(connector);
|
2018-10-29 15:15:46 +05:30
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
2018-01-09 13:53:13 -05:00
|
|
|
int ret = 0;
|
2018-01-08 14:55:39 -05:00
|
|
|
|
2018-10-29 15:15:46 +05:30
|
|
|
if (!hdcp->shim)
|
2018-01-08 14:55:39 -05:00
|
|
|
return -ENOENT;
|
|
|
|
|
|
2018-10-29 15:15:46 +05:30
|
|
|
mutex_lock(&hdcp->mutex);
|
2020-08-18 11:38:57 -04:00
|
|
|
mutex_lock(&dig_port->hdcp_mutex);
|
2018-01-08 14:55:39 -05:00
|
|
|
|
2020-08-18 11:38:56 -04:00
|
|
|
if (hdcp->value == DRM_MODE_CONTENT_PROTECTION_UNDESIRED)
|
|
|
|
|
goto out;
|
2018-01-08 14:55:39 -05:00
|
|
|
|
2020-08-18 11:38:56 -04:00
|
|
|
intel_hdcp_update_value(connector,
|
|
|
|
|
DRM_MODE_CONTENT_PROTECTION_UNDESIRED, false);
|
|
|
|
|
if (hdcp->hdcp2_encrypted)
|
2021-03-19 15:32:06 +05:30
|
|
|
ret = _intel_hdcp2_disable(connector, false);
|
2020-08-18 11:38:56 -04:00
|
|
|
else if (hdcp->hdcp_encrypted)
|
|
|
|
|
ret = _intel_hdcp_disable(connector);
|
|
|
|
|
|
|
|
|
|
out:
|
2020-08-18 11:38:57 -04:00
|
|
|
mutex_unlock(&dig_port->hdcp_mutex);
|
2018-10-29 15:15:46 +05:30
|
|
|
mutex_unlock(&hdcp->mutex);
|
|
|
|
|
cancel_delayed_work_sync(&hdcp->check_work);
|
2018-01-08 14:55:39 -05:00
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-13 18:48:30 +02:00
|
|
|
void intel_hdcp_update_pipe(struct intel_atomic_state *state,
|
|
|
|
|
struct intel_encoder *encoder,
|
2020-01-28 18:38:03 +02:00
|
|
|
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;
|
2020-08-05 17:15:20 +05:30
|
|
|
bool content_protection_type_changed, desired_and_not_enabled = false;
|
|
|
|
|
|
|
|
|
|
if (!connector->hdcp.shim)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
content_protection_type_changed =
|
2020-01-28 18:38:03 +02:00
|
|
|
(conn_state->hdcp_content_type != hdcp->content_type &&
|
|
|
|
|
conn_state->content_protection !=
|
|
|
|
|
DRM_MODE_CONTENT_PROTECTION_UNDESIRED);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* 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_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;
|
2021-01-11 13:41:03 +05:30
|
|
|
drm_connector_get(&connector->base);
|
2020-01-28 18:38:03 +02:00
|
|
|
schedule_work(&hdcp->prop_work);
|
|
|
|
|
mutex_unlock(&hdcp->mutex);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (conn_state->content_protection ==
|
2020-06-30 13:50:48 +05:30
|
|
|
DRM_MODE_CONTENT_PROTECTION_DESIRED) {
|
|
|
|
|
mutex_lock(&hdcp->mutex);
|
|
|
|
|
/* Avoid enabling hdcp, if it already ENABLED */
|
|
|
|
|
desired_and_not_enabled =
|
|
|
|
|
hdcp->value != DRM_MODE_CONTENT_PROTECTION_ENABLED;
|
|
|
|
|
mutex_unlock(&hdcp->mutex);
|
2021-01-11 13:41:02 +05:30
|
|
|
/*
|
|
|
|
|
* If HDCP already ENABLED and CP property is DESIRED, schedule
|
|
|
|
|
* prop_work to update correct CP property to user space.
|
|
|
|
|
*/
|
|
|
|
|
if (!desired_and_not_enabled && !content_protection_type_changed) {
|
|
|
|
|
drm_connector_get(&connector->base);
|
|
|
|
|
schedule_work(&hdcp->prop_work);
|
|
|
|
|
}
|
2020-06-30 13:50:48 +05:30
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (desired_and_not_enabled || content_protection_type_changed)
|
2020-01-28 18:38:03 +02:00
|
|
|
intel_hdcp_enable(connector,
|
2021-01-11 13:41:06 +05:30
|
|
|
crtc_state,
|
2020-01-28 18:38:03 +02:00
|
|
|
(u8)conn_state->hdcp_content_type);
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-16 23:06:51 +05:30
|
|
|
void intel_hdcp_component_fini(struct drm_i915_private *dev_priv)
|
|
|
|
|
{
|
2022-08-29 16:18:08 +03:00
|
|
|
mutex_lock(&dev_priv->display.hdcp.comp_mutex);
|
|
|
|
|
if (!dev_priv->display.hdcp.comp_added) {
|
|
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2022-08-29 16:18:08 +03:00
|
|
|
dev_priv->display.hdcp.comp_added = false;
|
|
|
|
|
mutex_unlock(&dev_priv->display.hdcp.comp_mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
|
|
|
|
|
component_del(dev_priv->drm.dev, &i915_hdcp_component_ops);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void intel_hdcp_cleanup(struct intel_connector *connector)
|
|
|
|
|
{
|
2020-08-18 11:38:55 -04:00
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
|
|
|
|
|
|
|
|
|
if (!hdcp->shim)
|
2019-02-16 23:06:51 +05:30
|
|
|
return;
|
|
|
|
|
|
2020-08-18 11:38:55 -04:00
|
|
|
/*
|
|
|
|
|
* If the connector is registered, it's possible userspace could kick
|
|
|
|
|
* off another HDCP enable, which would re-spawn the workers.
|
|
|
|
|
*/
|
|
|
|
|
drm_WARN_ON(connector->base.dev,
|
|
|
|
|
connector->base.registration_state == DRM_CONNECTOR_REGISTERED);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Now that the connector is not registered, check_work won't be run,
|
|
|
|
|
* but cancel any outstanding instances of it
|
|
|
|
|
*/
|
|
|
|
|
cancel_delayed_work_sync(&hdcp->check_work);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* We don't cancel prop_work in the same way as check_work since it
|
|
|
|
|
* requires connection_mutex which could be held while calling this
|
|
|
|
|
* function. Instead, we rely on the connector references grabbed before
|
|
|
|
|
* scheduling prop_work to ensure the connector is alive when prop_work
|
|
|
|
|
* is run. So if we're in the destroy path (which is where this
|
|
|
|
|
* function should be called), we're "guaranteed" that prop_work is not
|
|
|
|
|
* active (tl;dr This Should Never Happen).
|
|
|
|
|
*/
|
|
|
|
|
drm_WARN_ON(connector->base.dev, work_pending(&hdcp->prop_work));
|
|
|
|
|
|
|
|
|
|
mutex_lock(&hdcp->mutex);
|
|
|
|
|
hdcp->shim = NULL;
|
|
|
|
|
mutex_unlock(&hdcp->mutex);
|
2019-02-16 23:06:51 +05:30
|
|
|
}
|
|
|
|
|
|
2018-01-08 14:55:39 -05:00
|
|
|
void intel_hdcp_atomic_check(struct drm_connector *connector,
|
|
|
|
|
struct drm_connector_state *old_state,
|
|
|
|
|
struct drm_connector_state *new_state)
|
|
|
|
|
{
|
2019-01-16 11:15:19 +02:00
|
|
|
u64 old_cp = old_state->content_protection;
|
|
|
|
|
u64 new_cp = new_state->content_protection;
|
2018-01-08 14:55:39 -05:00
|
|
|
struct drm_crtc_state *crtc_state;
|
|
|
|
|
|
|
|
|
|
if (!new_state->crtc) {
|
|
|
|
|
/*
|
|
|
|
|
* If the connector is being disabled with CP enabled, mark it
|
|
|
|
|
* desired so it's re-enabled when the connector is brought back
|
|
|
|
|
*/
|
|
|
|
|
if (old_cp == DRM_MODE_CONTENT_PROTECTION_ENABLED)
|
|
|
|
|
new_state->content_protection =
|
|
|
|
|
DRM_MODE_CONTENT_PROTECTION_DESIRED;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2020-06-30 13:50:48 +05:30
|
|
|
crtc_state = drm_atomic_get_new_crtc_state(new_state->state,
|
|
|
|
|
new_state->crtc);
|
|
|
|
|
/*
|
|
|
|
|
* Fix the HDCP uapi content protection state in case of modeset.
|
|
|
|
|
* FIXME: As per HDCP content protection property uapi doc, an uevent()
|
|
|
|
|
* need to be sent if there is transition from ENABLED->DESIRED.
|
|
|
|
|
*/
|
|
|
|
|
if (drm_atomic_crtc_needs_modeset(crtc_state) &&
|
|
|
|
|
(old_cp == DRM_MODE_CONTENT_PROTECTION_ENABLED &&
|
|
|
|
|
new_cp != DRM_MODE_CONTENT_PROTECTION_UNDESIRED))
|
|
|
|
|
new_state->content_protection =
|
|
|
|
|
DRM_MODE_CONTENT_PROTECTION_DESIRED;
|
|
|
|
|
|
2018-01-08 14:55:39 -05:00
|
|
|
/*
|
|
|
|
|
* Nothing to do if the state didn't change, or HDCP was activated since
|
2019-08-01 17:11:15 +05:30
|
|
|
* the last commit. And also no change in hdcp content type.
|
2018-01-08 14:55:39 -05:00
|
|
|
*/
|
|
|
|
|
if (old_cp == new_cp ||
|
|
|
|
|
(old_cp == DRM_MODE_CONTENT_PROTECTION_DESIRED &&
|
2019-08-01 17:11:15 +05:30
|
|
|
new_cp == DRM_MODE_CONTENT_PROTECTION_ENABLED)) {
|
|
|
|
|
if (old_state->hdcp_content_type ==
|
|
|
|
|
new_state->hdcp_content_type)
|
|
|
|
|
return;
|
|
|
|
|
}
|
2018-01-08 14:55:39 -05:00
|
|
|
|
|
|
|
|
crtc_state->mode_changed = true;
|
|
|
|
|
}
|
2019-02-16 23:06:52 +05:30
|
|
|
|
|
|
|
|
/* Handles the CP_IRQ raised from the DP HDCP sink */
|
|
|
|
|
void intel_hdcp_handle_cp_irq(struct intel_connector *connector)
|
|
|
|
|
{
|
|
|
|
|
struct intel_hdcp *hdcp = &connector->hdcp;
|
|
|
|
|
|
|
|
|
|
if (!hdcp->shim)
|
|
|
|
|
return;
|
|
|
|
|
|
2019-02-16 23:07:02 +05:30
|
|
|
atomic_inc(&connector->hdcp.cp_irq_count);
|
|
|
|
|
wake_up_all(&connector->hdcp.cp_irq_queue);
|
|
|
|
|
|
2019-02-16 23:06:52 +05:30
|
|
|
schedule_delayed_work(&hdcp->check_work, 0);
|
|
|
|
|
}
|