drm/hdcp: Pull HDCP auth/exchange/check into helpers
Subsystems (9)
Sean Paul
reviewerv3 cover drm/hdcp: Pull HDCP auth/exchange/check into helpers
From: Sean Paul <[email protected]>
Hello again,
Here is v3 of the patch series. Notable changes include incorporating review feedback involving:
- Changed dt-bindings to introduce new compatible string
- Code changes in msm driver as suggested by Stephen & Abhinav
- Fixed issues found by 0-day
Thank you to the reviewers for their feedback thus far!
Please take a look,
Sean
Sean Paul (14):
drm/hdcp: Add drm_hdcp_atomic_check()
drm/hdcp: Avoid changing crtc state in hdcp atomic check drm/hdcp: Update property value on content type and user changes drm/hdcp: Expand HDCP helper library for enable/disable/check drm/i915/hdcp: Consolidate HDCP setup/state cache drm/i915/hdcp: Retain hdcp_capable return codes drm/i915/hdcp: Use HDCP helpers for i915 drm/msm/dpu_kms: Re-order dpu includes
drm/msm/dpu: Remove useless checks in dpu_encoder drm/msm/dpu: Remove encoder->enable() hack drm/msm/dp: Re-order dp_audio_put in deinit_sub_modules
dt-bindings: msm/dp: Add bindings for HDCP registers
arm64: dts: qcom: sc7180: Add support for HDCP in dp-controller drm/msm: Implement HDCP 1.x using the new drm HDCP helpers
.../bindings/display/msm/dp-controller.yaml | 34 +- arch/arm64/boot/dts/qcom/sc7180.dtsi | 6 +- drivers/gpu/drm/drm_hdcp.c | 1197 ++++++++++++++++- drivers/gpu/drm/i915/display/intel_atomic.c | 7 +- drivers/gpu/drm/i915/display/intel_ddi.c | 29 +- .../drm/i915/display/intel_display_debugfs.c | 11 +- .../drm/i915/display/intel_display_types.h | 58 +- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 345 ++--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 17 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 1011 +++----------- drivers/gpu/drm/i915/display/intel_hdcp.h | 36 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 256 ++-- drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 17 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 30 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 - drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 4 - drivers/gpu/drm/msm/dp/dp_debug.c | 46 +- drivers/gpu/drm/msm/dp/dp_debug.h | 6 +- drivers/gpu/drm/msm/dp/dp_display.c | 49 +- drivers/gpu/drm/msm/dp/dp_display.h | 5 + drivers/gpu/drm/msm/dp/dp_drm.c | 68 +- drivers/gpu/drm/msm/dp/dp_drm.h | 5 + drivers/gpu/drm/msm/dp/dp_hdcp.c | 445 ++++++ drivers/gpu/drm/msm/dp/dp_hdcp.h | 27 + drivers/gpu/drm/msm/dp/dp_parser.c | 23 +- drivers/gpu/drm/msm/dp/dp_parser.h | 4 + drivers/gpu/drm/msm/dp/dp_reg.h | 44 +- drivers/gpu/drm/msm/msm_atomic.c | 15 + include/drm/drm_hdcp.h | 194 +++ 30 files changed, 2600 insertions(+), 1392 deletions(-) create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.c create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.h
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Sean Paul
reviewerPATCH v3 1/14 drm/hdcp: Add drm_hdcp_atomic_check()
From: Sean Paul <[email protected]>
This patch moves the hdcp atomic check from i915 to drm_hdcp so other drivers can use it. No functional changes, just cleaned up some of the code when moving it over.
Changes in v2:
-None
Changes in v3:
-None
--- drivers/gpu/drm/drm_hdcp.c | 71 ++++++++++++++++++++- drivers/gpu/drm/i915/display/intel_atomic.c | 4 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 47 -------------- drivers/gpu/drm/i915/display/intel_hdcp.h | 3 - include/drm/drm_hdcp.h | 3 + 5 files changed, 75 insertions(+), 53 deletions(-)
drivers/gpu/drm/drm_hdcp.c +70 -1
@@ -13,13 +13,14 @@#include <linux/slab.h> #include <linux/firmware.h> +#include <drm/drm_atomic.h> +#include <drm/drm_connector.h> #include <drm/drm_hdcp.h> #include <drm/drm_sysfs.h> #include <drm/drm_print.h> #include <drm/drm_device.h> #include <drm/drm_property.h> #include <drm/drm_mode_object.h> -#include <drm/drm_connector.h> #include "drm_internal.h"
@@ -421,3 +422,71 @@ void drm_hdcp_update_content_protection(struct drm_connector *connector, dev->mode_config.content_protection_property); }EXPORT_SYMBOL (drm_hdcp_update_content_protection); + +/** +* drm_hdcp_atomic_check - Helper for drivers to call during connector->atomic_check +* +* @state: pointer to the atomic state being checked +* @connector: drm_connector on which content protection state needs an update +* +* This function can be used by display drivers to perform an atomic check on the +* hdcp state elements. If hdcp state has changed, this function will set +* mode_changed on the crtc driving the connector so it can update its hardware +* to match the hdcp state. +*/ +void drm_hdcp_atomic_check (struct drm_connector *connector, +struct drm_atomic_state *state) +{ +struct drm_connector_state *new_conn_state, *old_conn_state; +struct drm_crtc_state *new_crtc_state; +u64 old_hdcp, new_hdcp; + + old_conn_state =drm_atomic_get_old_connector_state (state, connector); + old_hdcp = old_conn_state->content_protection; + + new_conn_state =drm_atomic_get_new_connector_state (state, connector); + new_hdcp = new_conn_state->content_protection; + +if (!new_conn_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_hdcp ==DRM_MODE_CONTENT_PROTECTION_ENABLED ) + new_conn_state->content_protection = +DRM_MODE_CONTENT_PROTECTION_DESIRED ; +return ; + } + + new_crtc_state =drm_atomic_get_new_crtc_state (state, + new_conn_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 (new_crtc_state) && + (old_hdcp ==DRM_MODE_CONTENT_PROTECTION_ENABLED && + new_hdcp !=DRM_MODE_CONTENT_PROTECTION_UNDESIRED )) + new_conn_state->content_protection = +DRM_MODE_CONTENT_PROTECTION_DESIRED ; + +/* +* Nothing to do if content type is unchanged and one of: +* - state didn't change +* - HDCP was activated since the last commit +* - attempting to set to desired while already enabled +*/ +if (old_hdcp == new_hdcp || + (old_hdcp ==DRM_MODE_CONTENT_PROTECTION_DESIRED && + new_hdcp ==DRM_MODE_CONTENT_PROTECTION_ENABLED ) || + (old_hdcp ==DRM_MODE_CONTENT_PROTECTION_ENABLED && + new_hdcp ==DRM_MODE_CONTENT_PROTECTION_DESIRED )) { +if (old_conn_state->hdcp_content_type == + new_conn_state->hdcp_content_type) +return ; + } + + new_crtc_state->mode_changed = true; +} +EXPORT_SYMBOL (drm_hdcp_atomic_check);
drivers/gpu/drm/i915/display/intel_atomic.c +2 -2
@@ -32,13 +32,13 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_fourcc.h> +#include <drm/drm_hdcp.h> #include <drm/drm_plane_helper.h> #include "intel_atomic.h" #include "intel_cdclk.h" #include "intel_display_types.h" #include "intel_global_state.h" -#include "intel_hdcp.h" #include "intel_psr.h" #include "skl_universal_plane.h"
@@ -122,7 +122,7 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn,to_intel_digital_connector_state (old_state);struct drm_crtc_state *crtc_state; -intel_hdcp_atomic_check (conn, old_state, new_state); +drm_hdcp_atomic_check (conn, state);if (!new_state->crtc)return 0 ;
drivers/gpu/drm/i915/display/intel_hdcp.c +0 -47
53 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_hdcp.h +0 -3
@@ -22,9 +22,6 @@ struct intel_digital_port;enum port ;enum transcoder ; -void intel_hdcp_atomic_check (struct drm_connector *connector, -struct drm_connector_state *old_state, -struct drm_connector_state *new_state);int intel_hdcp_init (struct intel_connector *connector,struct intel_digital_port *dig_port,const struct intel_hdcp_shim *hdcp_shim);
include/drm/drm_hdcp.h +3 -0
@@ -291,6 +291,7 @@ struct hdcp_srm_header {u8 srm_gen_no; } __packed; +struct drm_atomic_state ;struct drm_device ;struct drm_connector ;
@@ -300,6 +301,8 @@ int drm_connector_attach_content_protection_property( struct drm_connector *connector, bool hdcp_content_type);void drm_hdcp_update_content_protection (struct drm_connector *connector,u64 val); +void drm_hdcp_atomic_check (struct drm_connector *connector, +struct drm_atomic_state *state);/* Content Type classification for HDCP2.2 vs others */ #define DRM_MODE_HDCP_CONTENT_TYPE0 0
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Re: [Freedreno] [PATCH v3 01/14] drm/hdcp: Add drm_hdcp_atomic_check()
Quoted 8 lines · Sean Paul
From: Sean Paul <[email protected]>
This patch moves the hdcp atomic check from i915 to
drm_hdcpso other drivers can use it. No functional changes, just cleaned up some of the code when moving it over.Acked-by Jani Nikula <[email protected]>Signed-off-by Sean Paul <[email protected]>
For the drm/hdcp pieces:
Quoted 250 lines
Link:
https://patchwork.freedesktop.org/patch/msgid/[email protected]
#v1
Link:
https://patchwork.freedesktop.org/patch/msgid/[email protected]
#v2Changes in v2:
-None
Changes in v3:(quoted diff) +0
-2-None --- drivers/gpu/drm/drm_hdcp.c | 71 ++++++++++++++++++++- drivers/gpu/drm/i915/display/intel_atomic.c | 4 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 47 -------------- drivers/gpu/drm/i915/display/intel_hdcp.h | 3 - include/drm/drm_hdcp.h | 3 + 5 files changed, 75 insertions(+), 53 deletions(-)drivers/gpu/drm/drm_hdcp.c +5
-1@@ -13,13 +13,14 @@#include <linux/slab.h> #include <linux/firmware.h> +#include <drm/drm_atomic.h> +#include <drm/drm_connector.h> #include <drm/drm_hdcp.h> #include <drm/drm_sysfs.h> #include <drm/drm_print.h> #include <drm/drm_device.h> #include <drm/drm_property.h> #include <drm/drm_mode_object.h> -#include <drm/drm_connector.h> #include "drm_internal.h" @@ -421,3 +422,71 @@ void drm_hdcp_update_content_protection(struct drm_connector *connector, dev->mode_config.content_protection_property); }EXPORT_SYMBOL (drm_hdcp_update_content_protection); + +/** +* drm_hdcp_atomic_check - Helper for drivers to call during
connector->atomic_check
+ *
+ * @state: pointer to the atomic state being checked
+ * @connector:drm_connectoron which content protection state needs an update
+ *
+ * This function can be used by display drivers to perform an atomic check on the
+ * hdcp state elements. If hdcp state has changed, this function will set
+ *mode_changedon the crtc driving the connector so it can update its hardware
+ * to match the hdcp state.
+ */drivers/gpu/drm/drm_hdcp.c +8
-0+void drm_hdcp_atomic_check (struct drm_connector *connector, +struct drm_atomic_state *state) +{ +struct drm_connector_state *new_conn_state, *old_conn_state; +struct drm_crtc_state *new_crtc_state; +u64 old_hdcp, new_hdcp; + + old_conn_state = drm_atomic_get_old_connector_state(state,connector);
drivers/gpu/drm/drm_hdcp.c +3
-0+ old_hdcp = old_conn_state->content_protection; + + new_conn_state = drm_atomic_get_new_connector_state(state,connector);
drivers/gpu/drm/drm_hdcp.c +18
-0+ new_hdcp = new_conn_state->content_protection; + +if (!new_conn_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_hdcp ==DRM_MODE_CONTENT_PROTECTION_ENABLED ) + new_conn_state->content_protection = +DRM_MODE_CONTENT_PROTECTION_DESIRED ; +return ; + } + + new_crtc_state =drm_atomic_get_new_crtc_state (state, + new_conn_state->crtc); +/* +* Fix the HDCP uapi content protection state in case of modeset. +* FIXME: As per HDCP content protection property uapi doc, an
uevent()drivers/gpu/drm/drm_hdcp.c +27
-0+* need to be sent if there is transition from ENABLED->DESIRED. +*/ +if (drm_atomic_crtc_needs_modeset (new_crtc_state) && + (old_hdcp ==DRM_MODE_CONTENT_PROTECTION_ENABLED && + new_hdcp !=DRM_MODE_CONTENT_PROTECTION_UNDESIRED )) + new_conn_state->content_protection = +DRM_MODE_CONTENT_PROTECTION_DESIRED ; + +/* +* Nothing to do if content type is unchanged and one of: +* - state didn't change +* - HDCP was activated since the last commit +* - attempting to set to desired while already enabled +*/ +if (old_hdcp == new_hdcp || + (old_hdcp ==DRM_MODE_CONTENT_PROTECTION_DESIRED && + new_hdcp ==DRM_MODE_CONTENT_PROTECTION_ENABLED ) || + (old_hdcp ==DRM_MODE_CONTENT_PROTECTION_ENABLED && + new_hdcp ==DRM_MODE_CONTENT_PROTECTION_DESIRED )) { +if (old_conn_state->hdcp_content_type == + new_conn_state->hdcp_content_type) +return ; + } + + new_crtc_state->mode_changed = true; +} +EXPORT_SYMBOL (drm_hdcp_atomic_check);drivers/gpu/drm/i915/display/intel_atomic.c +2
-2@@ -32,13 +32,13 @@#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_fourcc.h> +#include <drm/drm_hdcp.h> #include <drm/drm_plane_helper.h> #include "intel_atomic.h" #include "intel_cdclk.h" #include "intel_display_types.h" #include "intel_global_state.h" -#include "intel_hdcp.h" #include "intel_psr.h" #include "skl_universal_plane.h" @@ -122,7 +122,7 @@ int intel_digital_connector_atomic_check(structdrm_connector *conn,to_intel_digital_connector_state (old_state );struct drm_crtc_state *crtc_state; -intel_hdcp_atomic_check (conn, old_state, new_state); +drm_hdcp_atomic_check (conn, state);if (!new_state->crtc)drivers/gpu/drm/i915/display/intel_atomic.c +0
-0return 0 ;drivers/gpu/drm/i915/display/intel_hdcp.c +0
-34@@ -2501,53 +2501,6 @@ void intel_hdcp_cleanup(struct intel_connector *connector)mutex_unlock (&hdcp->mutex); } -void intel_hdcp_atomic_check (struct drm_connector *connector, -struct drm_connector_state *old_state, -struct drm_connector_state *new_state) -{ -u64 old_cp = old_state->content_protection; -u64 new_cp = new_state->content_protection; -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 ; - } - - 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 ; - -/* -* Nothing to do if the state didn't change, or HDCP was activated since
drivers/gpu/drm/i915/display/intel_hdcp.c +0
-13-* the last commit. And also no change in hdcp content type. -*/ -if (old_cp == new_cp || - (old_cp ==DRM_MODE_CONTENT_PROTECTION_DESIRED && - new_cp ==DRM_MODE_CONTENT_PROTECTION_ENABLED )) { -if (old_state->hdcp_content_type == - new_state->hdcp_content_type) -return ; - } - - crtc_state->mode_changed = true; -} -/* Handles the CP_IRQ raised from the DP HDCP sink */ void intel_hdcp_handle_cp_irq (struct intel_connector *connector) {drivers/gpu/drm/i915/display/intel_hdcp.h +0
-3@@ -22,9 +22,6 @@ struct intel_digital_port;enum port ;enum transcoder ; -void intel_hdcp_atomic_check (struct drm_connector *connector, -struct drm_connector_state *old_state, -struct drm_connector_state *new_state);int intel_hdcp_init (struct intel_connector *connector,struct intel_digital_port *dig_port,const struct intel_hdcp_shim *hdcp_shim);include/drm/drm_hdcp.h +1
-0@@ -291,6 +291,7 @@ struct hdcp_srm_header {u8 srm_gen_no; } __packed; +struct drm_atomic_state ;struct drm_device ;struct drm_connector ;@@ -300,6 +301,8 @@ intdrm_connector_attach_content_protection_property(
structdrm_connector*connector, boolhdcp_content_type);
void drm_hdcp_update_content_protection(structdrm_connector
*connector,include/drm/drm_hdcp.h +2
-0u64 val); +void drm_hdcp_atomic_check (struct drm_connector *connector, +struct drm_atomic_state *state);/* Content Type classification for HDCP2.2 vs others */ #define DRM_MODE_HDCP_CONTENT_TYPE0 0
Sean Paul
reviewerPATCH v3 2/14 drm/hdcp: Avoid changing crtc state in hdcp atomic check
In reply to Sean PaulFrom: Sean Paul <[email protected]>
Instead of forcing a modeset in the hdcp atomic check, simply return true if the content protection value is changing and let the driver decide whether a modeset is required or not.
Changes in v2:
-None
Changes in v3:
-None
--- drivers/gpu/drm/drm_hdcp.c | 33 +++++++++++++++------ drivers/gpu/drm/i915/display/intel_atomic.c | 5 ++-- include/drm/drm_hdcp.h | 2 +- 3 files changed, 27 insertions(+), 13 deletions(-)
drivers/gpu/drm/drm_hdcp.c +24 -9
@@ -430,11 +430,14 @@ EXPORT_SYMBOL(drm_hdcp_update_content_protection);* @connector: drm_connector on which content protection state needs an update * * This function can be used by display drivers to perform an atomic check on the -* hdcp state elements. If hdcp state has changed, this function will set -* mode_changed on the crtc driving the connector so it can update its hardware -* to match the hdcp state. +* hdcp state elements. If hdcp state has changed in a manner which requires the +* driver to enable or disable content protection, this function will return +* true. +* +* Returns: +* true if the driver must enable/disable hdcp, false otherwise */ -void drm_hdcp_atomic_check (struct drm_connector *connector, +bool drm_hdcp_atomic_check (struct drm_connector *connector,struct drm_atomic_state *state) {struct drm_connector_state *new_conn_state, *old_conn_state;
@@ -452,10 +455,12 @@ void drm_hdcp_atomic_check(struct drm_connector *connector,* 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_hdcp ==DRM_MODE_CONTENT_PROTECTION_ENABLED ) +if (old_hdcp ==DRM_MODE_CONTENT_PROTECTION_ENABLED ) { new_conn_state->content_protection =DRM_MODE_CONTENT_PROTECTION_DESIRED ; -return ; +return true; + } +return false; } new_crtc_state = drm_atomic_get_new_crtc_state(state,
@@ -467,9 +472,19 @@ void drm_hdcp_atomic_check(struct drm_connector *connector,*/ if (drm_atomic_crtc_needs_modeset (new_crtc_state) && (old_hdcp ==DRM_MODE_CONTENT_PROTECTION_ENABLED && - new_hdcp !=DRM_MODE_CONTENT_PROTECTION_UNDESIRED )) + new_hdcp !=DRM_MODE_CONTENT_PROTECTION_UNDESIRED )) { new_conn_state->content_protection =DRM_MODE_CONTENT_PROTECTION_DESIRED ; +return true; + } + +/* +* Coming back from disable or changing CRTC with DESIRED state requires +* that the driver try CP enable. +*/ +if (new_hdcp ==DRM_MODE_CONTENT_PROTECTION_DESIRED && + new_conn_state->crtc != old_conn_state->crtc) +return true;/* * Nothing to do if content type is unchanged and one of:
@@ -484,9 +499,9 @@ void drm_hdcp_atomic_check(struct drm_connector *connector, new_hdcp == DRM_MODE_CONTENT_PROTECTION_DESIRED)) {if (old_conn_state->hdcp_content_type == new_conn_state->hdcp_content_type) -return ; +return false; } - new_crtc_state->mode_changed = true; +return true; }EXPORT_SYMBOL (drm_hdcp_atomic_check);
drivers/gpu/drm/i915/display/intel_atomic.c +2 -3
@@ -122,8 +122,6 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn,to_intel_digital_connector_state (old_state);struct drm_crtc_state *crtc_state; -drm_hdcp_atomic_check (conn, state); -if (!new_state->crtc)return 0 ;
@@ -139,7 +137,8 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn, new_conn_state->base.picture_aspect_ratio != old_conn_state->base.picture_aspect_ratio || new_conn_state->base.content_type != old_conn_state->base.content_type || new_conn_state->base.scaling_mode != old_conn_state->base.scaling_mode || - !drm_connector_atomic_hdr_metadata_equal(old_state, new_state)) + !drm_connector_atomic_hdr_metadata_equal (old_state, new_state) || + drm_hdcp_atomic_check(conn, state)) crtc_state->mode_changed = true;return 0 ;
include/drm/drm_hdcp.h +1 -1
@@ -301,7 +301,7 @@ int drm_connector_attach_content_protection_property( struct drm_connector *connector, bool hdcp_content_type);void drm_hdcp_update_content_protection (struct drm_connector *connector,u64 val); -void drm_hdcp_atomic_check (struct drm_connector *connector, +bool drm_hdcp_atomic_check (struct drm_connector *connector,struct drm_atomic_state *state);/* Content Type classification for HDCP2.2 vs others */
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Sean Paul
reviewerPATCH v3 3/14 drm/hdcp: Update property value on content type and user changes
In reply to Sean PaulFrom: Sean Paul <[email protected]>
This patch updates the connector's property value in 2 cases which were previously missed:
1- Content type changes. The value should revert back to DESIRED from
ENABLED in case the driver must re-authenticate the link due to the new content type.
2- Userspace sets value to DESIRED while ENABLED. In this case, the
value should be reset immediately to ENABLED since the link is actively being encrypted.
To accommodate these changes, I've split up the conditionals to make things a bit more clear (as much as one can with this mess of state).
Changes in v2:
-None
Changes in v3:
-Fixed indentation issue identified by 0-day
--- drivers/gpu/drm/drm_hdcp.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)
drivers/gpu/drm/drm_hdcp.c +17 -9
@@ -487,21 +487,29 @@ bool drm_hdcp_atomic_check(struct drm_connector *connector,return true;/* -* Nothing to do if content type is unchanged and one of: -* - state didn't change +* Content type changes require an HDCP disable/enable cycle. +*/ +if (new_conn_state->hdcp_content_type != old_conn_state->hdcp_content_type) { + new_conn_state->content_protection = +DRM_MODE_CONTENT_PROTECTION_DESIRED ; +return true; + } + +/* +* Ignore meaningless state changes: * - HDCP was activated since the last commit -* - attempting to set to desired while already enabled +* - Attempting to set to desired while already enabled */ -if (old_hdcp == new_hdcp || - (old_hdcp ==DRM_MODE_CONTENT_PROTECTION_DESIRED && +if ((old_hdcp ==DRM_MODE_CONTENT_PROTECTION_DESIRED && new_hdcp ==DRM_MODE_CONTENT_PROTECTION_ENABLED ) || (old_hdcp ==DRM_MODE_CONTENT_PROTECTION_ENABLED && new_hdcp ==DRM_MODE_CONTENT_PROTECTION_DESIRED )) { -if (old_conn_state->hdcp_content_type == - new_conn_state->hdcp_content_type) -return false; + new_conn_state->content_protection = +DRM_MODE_CONTENT_PROTECTION_ENABLED ; +return false; } -return true; +/* Finally, if state changes, we need action */ +return old_hdcp != new_hdcp; }EXPORT_SYMBOL (drm_hdcp_atomic_check);
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Re: [Freedreno] [PATCH v3 03/14] drm/hdcp: Update property value on content type and user changes
Quoted 13 lines · Sean Paul
From: Sean Paul <[email protected]>
This patch updates the connector's property value in 2 cases which were previously missed:
1- Content type changes. The value should revert back to DESIRED from
ENABLED in case the driver must re-authenticate the link due to the new content type.2- Userspace sets value to DESIRED while ENABLED. In this case, the
value should be reset immediately to ENABLED since the link is actively being encrypted.
Quoted 5 lines
To accommodate these changes, I've split up the conditionals to make things a bit more clear (as much as one can with this mess of state).
Acked-by Jani Nikula <[email protected]>Signed-off-by Sean Paul <[email protected]>
Quoted 60 lines
Link:
https://patchwork.freedesktop.org/patch/msgid/[email protected]
#v1
Link:
https://patchwork.freedesktop.org/patch/msgid/[email protected]
#v2Changes in v2:
-None
Changes in v3:(quoted diff) +0
-2-Fixed indentation issue identified by 0-day --- drivers/gpu/drm/drm_hdcp.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)drivers/gpu/drm/drm_hdcp.c +17
-9@@ -487,21 +487,29 @@ bool drm_hdcp_atomic_check(struct drm_connector *connector, return true;/* -* Nothing to do if content type is unchanged and one of: -* - state didn't change +* Content type changes require an HDCP disable/enable cycle. +*/ +if (new_conn_state->hdcp_content_type != old_conn_state->hdcp_content_type) { + new_conn_state->content_protection = +DRM_MODE_CONTENT_PROTECTION_DESIRED ; +return true; + } + +/* +* Ignore meaningless state changes: * - HDCP was activated since the last commit -* - attempting to set to desired while already enabled +* - Attempting to set to desired while already enabled */ -if (old_hdcp == new_hdcp || - (old_hdcp ==DRM_MODE_CONTENT_PROTECTION_DESIRED && +if ((old_hdcp ==DRM_MODE_CONTENT_PROTECTION_DESIRED && new_hdcp ==DRM_MODE_CONTENT_PROTECTION_ENABLED ) || (old_hdcp ==DRM_MODE_CONTENT_PROTECTION_ENABLED && new_hdcp ==DRM_MODE_CONTENT_PROTECTION_DESIRED )) { -if (old_conn_state->hdcp_content_type == - new_conn_state->hdcp_content_type) -return false; + new_conn_state->content_protection = +DRM_MODE_CONTENT_PROTECTION_ENABLED ; +return false; } -return true; +/* Finally, if state changes, we need action */ +return old_hdcp != new_hdcp;}
EXPORT_SYMBOL(drm_hdcp_atomic_check);
Re: [Freedreno] [PATCH v3 03/14] drm/hdcp: Update property value on content type and user changes
In reply to Sean PaulQuoted 13 lines · Sean Paul
From: Sean Paul <[email protected]>
This patch updates the connector's property value in 2 cases which were previously missed:
1- Content type changes. The value should revert back to DESIRED from
ENABLED in case the driver must re-authenticate the link due to the new content type.2- Userspace sets value to DESIRED while ENABLED. In this case, the
value should be reset immediately to ENABLED since the link is actively being encrypted.
Quoted 5 lines
To accommodate these changes, I've split up the conditionals to make things a bit more clear (as much as one can with this mess of state).
Acked-by Jani Nikula <[email protected]>Signed-off-by Sean Paul <[email protected]>
Quoted 60 lines
Link:
https://patchwork.freedesktop.org/patch/msgid/[email protected]
#v1
Link:
https://patchwork.freedesktop.org/patch/msgid/[email protected]
#v2Changes in v2:
-None
Changes in v3:(quoted diff) +0
-2-Fixed indentation issue identified by 0-day --- drivers/gpu/drm/drm_hdcp.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)drivers/gpu/drm/drm_hdcp.c +17
-9@@ -487,21 +487,29 @@ bool drm_hdcp_atomic_check(struct drm_connector *connector, return true;/* -* Nothing to do if content type is unchanged and one of: -* - state didn't change +* Content type changes require an HDCP disable/enable cycle. +*/ +if (new_conn_state->hdcp_content_type != old_conn_state->hdcp_content_type) { + new_conn_state->content_protection = +DRM_MODE_CONTENT_PROTECTION_DESIRED ; +return true; + } + +/* +* Ignore meaningless state changes: * - HDCP was activated since the last commit -* - attempting to set to desired while already enabled +* - Attempting to set to desired while already enabled */ -if (old_hdcp == new_hdcp || - (old_hdcp ==DRM_MODE_CONTENT_PROTECTION_DESIRED && +if ((old_hdcp ==DRM_MODE_CONTENT_PROTECTION_DESIRED && new_hdcp ==DRM_MODE_CONTENT_PROTECTION_ENABLED ) || (old_hdcp ==DRM_MODE_CONTENT_PROTECTION_ENABLED && new_hdcp ==DRM_MODE_CONTENT_PROTECTION_DESIRED )) { -if (old_conn_state->hdcp_content_type == - new_conn_state->hdcp_content_type) -return false; + new_conn_state->content_protection = +DRM_MODE_CONTENT_PROTECTION_ENABLED ; +return false; } -return true; +/* Finally, if state changes, we need action */ +return old_hdcp != new_hdcp;}
EXPORT_SYMBOL(drm_hdcp_atomic_check);
Sean Paul
reviewerPATCH v3 4/14 drm/hdcp: Expand HDCP helper library for enable/disable/check
In reply to Sean PaulFrom: Sean Paul <[email protected]>
This patch expands upon the HDCP helper library to manage HDCP enable, disable, and check.
Previous to this patch, the majority of the state management and sink interaction is tucked inside the Intel driver with the understanding that once a new platform supported HDCP we could make good decisions about what should be centralized. With the addition of HDCP support for Qualcomm, it's time to migrate the protocol-specific bits of HDCP authentication, key exchange, and link checks to the HDCP helper.
In terms of functionality, this migration is 1:1 with the Intel driver, however things are laid out a bit differently than with intel_hdcp.c, which is why this is a separate patch from the i915 transition to the helper. On i915, the "shim" vtable is used to account for HDMI vs. DP vs. DP-MST differences whereas the helper library uses a LUT to account for the register offsets and a remote read function to route the messages. On i915, storing the sink information in the source is done inline whereas now we use the new drm_hdcp_helper_funcs vtable to store and fetch information to/from source hw. Finally, instead of calling enable/disable directly from the driver, we'll leave that decision to the helper and by calling drm_hdcp_helper_atomic_commit() from the driver. All told, this will centralize the protocol and state handling in the helper, ensuring we collect all of our bugs^Wlogic in one place.
Changes in v2:
-Fixed set-but-unused variable identified by 0-day Changes in v3:
-Fixed uninitialized variable warning identified by 0-day
--- drivers/gpu/drm/drm_hdcp.c | 1103 ++++++++++++++++++++++++++++++++++++ include/drm/drm_hdcp.h | 191 +++++++ 2 files changed, 1294 insertions(+)
drivers/gpu/drm/drm_hdcp.c +1103 -0
@@ -6,15 +6,20 @@* Ramalingam C <[email protected]> */ +#include <linux/delay.h> #include <linux/device.h> #include <linux/err.h> #include <linux/gfp.h> +#include <linux/i2c.h> +#include <linux/iopoll.h> #include <linux/export.h> #include <linux/slab.h> #include <linux/firmware.h> +#include <linux/workqueue.h> #include <drm/drm_atomic.h> #include <drm/drm_connector.h> +#include <drm/drm_dp_helper.h> #include <drm/drm_hdcp.h> #include <drm/drm_sysfs.h> #include <drm/drm_print.h>
@@ -513,3 +518,1101 @@ bool drm_hdcp_atomic_check(struct drm_connector *connector,return old_hdcp != new_hdcp; }EXPORT_SYMBOL (drm_hdcp_atomic_check); + +struct drm_hdcp_helper_data { +struct mutex mutex; +struct mutex *driver_mutex; + +struct drm_connector *connector; +const struct drm_hdcp_helper_funcs *funcs; + +u64 value; +unsigned int enabled_type; + +struct delayed_work check_work; +struct work_struct prop_work; + +struct drm_dp_aux *aux; +const struct drm_hdcp_hdcp1_receiver_reg_lut *hdcp1_lut; +}; + +struct drm_hdcp_hdcp1_receiver_reg_lut { +unsigned int bksv; +unsigned int ri; +unsigned int aksv; +unsigned int an; +unsigned int ainfo; +unsigned int v[5 ]; +unsigned int bcaps; +unsigned int bcaps_mask_repeater_present; +unsigned int bstatus; +}; + +static const struct drm_hdcp_hdcp1_receiver_reg_lut drm_hdcp_hdcp1_ddc_lut = { + .bksv =DRM_HDCP_DDC_BKSV , + .ri =DRM_HDCP_DDC_RI_PRIME , + .aksv =DRM_HDCP_DDC_AKSV , + .an =DRM_HDCP_DDC_AN , + .ainfo =DRM_HDCP_DDC_AINFO , + .v = {DRM_HDCP_DDC_V_PRIME (0 ),DRM_HDCP_DDC_V_PRIME (1 ), +DRM_HDCP_DDC_V_PRIME (2 ),DRM_HDCP_DDC_V_PRIME (3 ), +DRM_HDCP_DDC_V_PRIME (4 ) }, + .bcaps =DRM_HDCP_DDC_BCAPS , + .bcaps_mask_repeater_present =DRM_HDCP_DDC_BCAPS_REPEATER_PRESENT , + .bstatus =DRM_HDCP_DDC_BSTATUS , +}; + +static const struct drm_hdcp_hdcp1_receiver_reg_lut drm_hdcp_hdcp1_dpcd_lut = { + .bksv =DP_AUX_HDCP_BKSV , + .ri =DP_AUX_HDCP_RI_PRIME , + .aksv =DP_AUX_HDCP_AKSV , + .an =DP_AUX_HDCP_AN , + .ainfo =DP_AUX_HDCP_AINFO , + .v = {DP_AUX_HDCP_V_PRIME (0 ),DP_AUX_HDCP_V_PRIME (1 ), +DP_AUX_HDCP_V_PRIME (2 ),DP_AUX_HDCP_V_PRIME (3 ), +DP_AUX_HDCP_V_PRIME (4 ) }, + .bcaps =DP_AUX_HDCP_BCAPS , + .bcaps_mask_repeater_present =DP_BCAPS_REPEATER_PRESENT , + +/* +* For some reason the HDMI and DP HDCP specs call this register +* definition by different names. In the HDMI spec, it's called BSTATUS, +* but in DP it's called BINFO. +*/ + .bstatus =DP_AUX_HDCP_BINFO , +}; + +static int drm_hdcp_remote_ddc_read (struct i2c_adapter *i2c, +unsigned int offset,u8 *value,size_t len) +{ +int ret; +u8 start = offset &0xff ; +struct i2c_msg msgs[] = { + { + .addr =DRM_HDCP_DDC_ADDR , + .flags =0 , + .len =1 , + .buf = &start, + }, + { + .addr =DRM_HDCP_DDC_ADDR , + .flags =I2C_M_RD , + .len = len, + .buf = value + } + }; + ret =i2c_transfer (i2c, msgs,ARRAY_SIZE (msgs)); +if (ret ==ARRAY_SIZE (msgs)) +return 0 ; +return ret >=0 ? -EIO : ret; +} + +static int drm_hdcp_remote_dpcd_read (struct drm_dp_aux *aux, +unsigned int offset,u8 *value, +size_t len) +{ +ssize_t ret; + + ret =drm_dp_dpcd_read (aux, offset, value, len); +if (ret != len) { +if (ret >=0 ) +return -EIO ; +return ret; + } + +return 0 ; +} + +static int drm_hdcp_remote_read (struct drm_hdcp_helper_data *data, +unsigned int offset,u8 *value,u8 len) +{ +if (data->aux) +return drm_hdcp_remote_dpcd_read (data->aux, offset, value, len); +else +return drm_hdcp_remote_ddc_read (data->connector->ddc, offset, value, len); +} + +static int drm_hdcp_remote_ddc_write (struct i2c_adapter *i2c, +unsigned int offset,u8 *buffer, +size_t size) +{ +int ret; +u8 *write_buf; +struct i2c_msg msg; + + write_buf =kzalloc (size +1 ,GFP_KERNEL ); +if (!write_buf) +return -ENOMEM ; + + write_buf[0 ] = offset &0xff ; +memcpy (&write_buf[1 ], buffer, size); + + msg.addr =DRM_HDCP_DDC_ADDR ; + msg.flags =0 , + msg.len = size +1 , + msg.buf = write_buf; + + ret =i2c_transfer (i2c, &msg,1 ); +if (ret ==1 ) + ret =0 ; +else if (ret >=0 ) + ret = -EIO ; + +kfree (write_buf); +return ret; +} + +static int drm_hdcp_remote_dpcd_write (struct drm_dp_aux *aux, +unsigned int offset,u8 *value, +size_t len) +{ +ssize_t ret; + + ret =drm_dp_dpcd_write (aux, offset, value, len); +if (ret != len) { +if (ret >=0 ) +return -EIO ; +return ret; + } + +return 0 ; +} + +static int drm_hdcp_remote_write (struct drm_hdcp_helper_data *data, +unsigned int offset,u8 *value,u8 len) +{ +if (data->aux) +return drm_hdcp_remote_dpcd_write (data->aux, offset, value, len); +else +return drm_hdcp_remote_ddc_write (data->connector->ddc, offset, + value, len); +} + +static bool drm_hdcp_is_ksv_valid (struct drm_hdcp_ksv *ksv) +{ +/* Valid Ksv has 20 0's and 20 1's */ +return hweight32 (ksv->words[0 ]) +hweight32 (ksv->words[1 ]) ==20 ; +} + +static int drm_hdcp_read_valid_bksv (struct drm_hdcp_helper_data *data, +struct drm_hdcp_ksv *bksv) +{ +int ret, i, tries =2 ; + +/* HDCP spec states that we must retry the bksv if it is invalid */ +for (i =0 ; i < tries; i++) { + ret =drm_hdcp_remote_read (data, data->hdcp1_lut->bksv, + bksv->bytes,DRM_HDCP_KSV_LEN ); +if (ret) +return ret; + +if (drm_hdcp_is_ksv_valid (bksv)) +break ; + } +if (i == tries) { +drm_dbg_kms (data->connector->dev,"Bksv is invalid %*ph\n" , +DRM_HDCP_KSV_LEN , bksv->bytes); +return -ENODEV ; + } + +return 0 ; +} + +/** +* drm_hdcp_helper_hdcp1_capable - Checks if the sink is capable of HDCP 1.x. +* +* @data: pointer to the HDCP helper data. +* @capable: pointer to a bool which will contain true if the sink is capable. +* +* Returns: +* -errno if the transacation between source and sink fails. +*/ +int drm_hdcp_helper_hdcp1_capable (struct drm_hdcp_helper_data *data, +bool *capable) +{ +/* +* DisplayPort has a dedicated bit for this in DPCD whereas HDMI spec +* states that transmitters should use bksv to determine capability. +*/ +if (data->aux) { +int ret; +u8 bcaps; + + ret =drm_hdcp_remote_read (data, data->hdcp1_lut->bcaps, + &bcaps,1 ); + *capable = !ret && (bcaps &DP_BCAPS_HDCP_CAPABLE ); + }else { +struct drm_hdcp_ksv bksv; + + *capable =drm_hdcp_read_valid_bksv (data, &bksv) ==0 ; + } + +return 0 ; +} +EXPORT_SYMBOL (drm_hdcp_helper_hdcp1_capable); + +static void drm_hdcp_update_value (struct drm_hdcp_helper_data *data, +u64 value,bool update_property) +{ +WARN_ON (!mutex_is_locked (&data->mutex)); + + data->value = value; +if (update_property) { +drm_connector_get (data->connector); +schedule_work (&data->prop_work); + } +} + +static int +drm_hdcp_helper_hdcp1_ksv_fifo_ready (struct drm_hdcp_helper_data *data) +{ +int ret; +u8 val, mask; + +/* KSV FIFO ready bit is stored in different locations on DP v. HDMI */ +if (data->aux) { + ret =drm_hdcp_remote_dpcd_read (data->aux,DP_AUX_HDCP_BSTATUS , + &val,1 ); + mask =DP_BSTATUS_READY ; + }else { + ret =drm_hdcp_remote_ddc_read (data->connector->ddc, +DRM_HDCP_DDC_BCAPS , &val,1 ); + mask =DRM_HDCP_DDC_BCAPS_KSV_FIFO_READY ; + } +if (ret) +return ret; +if (val & mask) +return 0 ; + +return -EAGAIN ; +} + +static int +drm_hdcp_helper_hdcp1_read_ksv_fifo (struct drm_hdcp_helper_data *data,u8 *fifo, +u8 num_downstream) +{ +struct drm_device *dev = data->connector->dev; +int ret, i; + +/* Over HDMI, read the whole thing at once */ +if (data->connector->ddc) { + ret =drm_hdcp_remote_ddc_read (data->connector->ddc, +DRM_HDCP_DDC_KSV_FIFO , fifo, + num_downstream *DRM_HDCP_KSV_LEN ); +if (ret) +drm_err (dev,"DDC ksv fifo read failed (%d)\n" , ret); +return ret; + } + +/* Over DP, read via 15 byte window (3 entries @ 5 bytes each) */ +for (i =0 ; i < num_downstream; i +=3 ) { +size_t len =min (num_downstream - i,3 ) *DRM_HDCP_KSV_LEN ; + ret =drm_hdcp_remote_dpcd_read (data->aux,DP_AUX_HDCP_KSV_FIFO , + fifo + i *DRM_HDCP_KSV_LEN , + len); +if (ret) { +drm_err (dev,"Read ksv[%d] from DP/AUX failed (%d)\n" , + i, ret); +return ret; + } + } + +return 0 ; +} + +static int drm_hdcp_helper_hdcp1_read_v_prime (struct drm_hdcp_helper_data *data, +u32 *v_prime) +{ +struct drm_device *dev = data->connector->dev; +int ret, i; + +for (i =0 ; i <DRM_HDCP_V_PRIME_NUM_PARTS ; i++) { + ret =drm_hdcp_remote_read (data, data->hdcp1_lut->v[i], + (u8 *)&v_prime[i], +DRM_HDCP_V_PRIME_PART_LEN ); +if (ret) { +drm_dbg_kms (dev,"Read v'[%d] from failed (%d)\n" , i, ret); +return ret >=0 ? -EIO : ret; + } + } +return 0 ; +} + +static int +drm_hdcp_helper_hdcp1_authenticate_downstream (struct drm_hdcp_helper_data *data) +{ +struct drm_connector *connector = data->connector; +struct drm_device *dev = connector->dev; +u32 v_prime[DRM_HDCP_V_PRIME_NUM_PARTS ]; +u8 bstatus[DRM_HDCP_BSTATUS_LEN ]; +u8 num_downstream, *ksv_fifo; +int ret, i, tries =3 ; + + ret =read_poll_timeout (drm_hdcp_helper_hdcp1_ksv_fifo_ready, ret, !ret, +10 *1000 ,5 *1000 *1000 , false, data); +if (ret) { +drm_err (dev,"Failed to poll ksv ready, %d\n" , ret); +return ret; + } + + ret =drm_hdcp_remote_read (data, data->hdcp1_lut->bstatus, + bstatus,DRM_HDCP_BSTATUS_LEN ); +if (ret) +return ret; + +/* +* 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 ]); +if (num_downstream ==0 ) { +drm_err (dev,"Repeater with zero downstream devices, %*ph\n" , +DRM_HDCP_BSTATUS_LEN , bstatus); +return -EINVAL ; + } + + ksv_fifo =kcalloc (DRM_HDCP_KSV_LEN , num_downstream,GFP_KERNEL ); +if (!ksv_fifo) +return -ENOMEM ; + + ret =drm_hdcp_helper_hdcp1_read_ksv_fifo (data, ksv_fifo, + num_downstream); +if (ret) { +drm_err (dev,"Failed to read ksv fifo, %d/%d\n" , num_downstream, + ret); + goto out; + } + +if (drm_hdcp_check_ksvs_revoked (dev, ksv_fifo, num_downstream)) { +drm_err (dev,"Revoked Ksv(s) in ksv_fifo\n" ); + ret = -EPERM ; + goto out; + } + +/* +* When V prime mismatches, DP Spec mandates re-read of +* V prime atleast twice. +*/ +for (i =0 ; i < tries; i++) { + ret =drm_hdcp_helper_hdcp1_read_v_prime (data, v_prime); +if (ret) +continue ; + + ret = data->funcs->hdcp1_store_ksv_fifo (connector, ksv_fifo, + num_downstream, + bstatus, v_prime); +if (!ret) +break ; + } +if (ret) +drm_err (dev,"Could not validate KSV FIFO with V' %d\n" , ret); + +out: +if (!ret) +drm_dbg_kms (dev,"HDCP is enabled (%d downstream devices)\n" , + num_downstream); + +kfree (ksv_fifo); +return ret; +} + +static int drm_hdcp_helper_hdcp1_validate_ri (struct drm_hdcp_helper_data *data) +{ +union { +u32 word; +u8 bytes[DRM_HDCP_RI_LEN ]; + } ri_prime = { .word =0 }; +struct drm_connector *connector = data->connector; +struct drm_device *dev = connector->dev; +int ret; + + ret =drm_hdcp_remote_read (data, data->hdcp1_lut->ri, ri_prime.bytes, +DRM_HDCP_RI_LEN ); +if (ret) { +drm_err (dev,"Failed to read R0' %d\n" , ret); +return ret; + } + +return data->funcs->hdcp1_match_ri (connector, ri_prime.word); +} + +static int drm_hdcp_helper_hdcp1_authenticate (struct drm_hdcp_helper_data *data) +{ +union { +u32 word; +u8 bytes[DRM_HDCP_BSTATUS_LEN ]; + } bstatus; +const struct drm_hdcp_helper_funcs *funcs = data->funcs; +struct drm_connector *connector = data->connector; +struct drm_device *dev = connector->dev; +unsigned long r0_prime_timeout, r0_prime_remaining_us =0 , tmp_jiffies; +struct drm_hdcp_ksv aksv; +struct drm_hdcp_ksv bksv; +struct drm_hdcp_an an; +bool repeater_present; +int ret, i, tries =3 ; +u8 bcaps; + +if (funcs->hdcp1_read_an_aksv) { + ret = funcs->hdcp1_read_an_aksv (connector, an.words, aksv.words); +if (ret) { +drm_err (dev,"Failed to read An/Aksv values, %d\n" , ret); +return ret; + } + + ret =drm_hdcp_remote_write (data, data->hdcp1_lut->an, an.bytes, +DRM_HDCP_AN_LEN ); +if (ret) { +drm_err (dev,"Failed to write An to receiver, %d\n" , ret); +return ret; + } + + ret =drm_hdcp_remote_write (data, data->hdcp1_lut->aksv, aksv.bytes, +DRM_HDCP_KSV_LEN ); +if (ret) { +drm_err (dev,"Failed to write Aksv to receiver, %d\n" , ret); +return ret; + } + }else { + ret = funcs->hdcp1_send_an_aksv (connector); +if (ret) { +drm_err (dev,"Failed to read An/Aksv values, %d\n" , ret); +return ret; + } + } + +/* +* Timeout 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. +*/ + r0_prime_timeout = jiffies +msecs_to_jiffies (300 ); + +memset (&bksv,0 ,sizeof (bksv)); + + ret =drm_hdcp_read_valid_bksv (data, &bksv); +if (ret <0 ) +return ret; + +if (drm_hdcp_check_ksvs_revoked (dev, bksv.bytes,1 )) { +drm_err (dev,"BKSV is revoked\n" ); +return -EPERM ; + } + + ret =drm_hdcp_remote_read (data, data->hdcp1_lut->bcaps, &bcaps,1 ); +if (ret) +return ret; + +memset (&bstatus,0 ,sizeof (bstatus)); + + ret =drm_hdcp_remote_read (data, data->hdcp1_lut->bstatus, + bstatus.bytes,DRM_HDCP_BSTATUS_LEN ); +if (ret) +return ret; + +if (DRM_HDCP_MAX_DEVICE_EXCEEDED (bstatus.bytes[0 ]) || +DRM_HDCP_MAX_CASCADE_EXCEEDED (bstatus.bytes[1 ])) { +drm_err (dev,"Max Topology Limit Exceeded, bstatus=%*ph\n" , +DRM_HDCP_BSTATUS_LEN , bstatus.bytes); +return -EPERM ; + } + + repeater_present = bcaps & data->hdcp1_lut->bcaps_mask_repeater_present; + + ret = funcs->hdcp1_store_receiver_info (connector, bksv.words, + bstatus.word, bcaps, + repeater_present); +if (ret) { +drm_err (dev,"Failed to store bksv, %d\n" , ret); +return ret; + } + + ret = funcs->hdcp1_enable_encryption (connector); +if (ret) +return ret; + + ret = funcs->hdcp1_wait_for_r0 (connector); +if (ret) +return ret; + + tmp_jiffies = jiffies; +if (time_before (tmp_jiffies, r0_prime_timeout)) + r0_prime_remaining_us =jiffies_to_usecs (r0_prime_timeout - tmp_jiffies); + +/* +* Wait for R0' to become available. +* +* On DP, there's an R0_READY bit available but no such bit +* exists on HDMI. So poll the ready bit for DP and just wait the +* remainder of the 300 ms timeout for HDMI. +*/ +if (data->aux) { +u8 val; + ret =read_poll_timeout (drm_hdcp_remote_dpcd_read, ret, + !ret && (val &DP_BSTATUS_R0_PRIME_READY ), +1000 , r0_prime_remaining_us, false, + data->aux,DP_AUX_HDCP_BSTATUS , &val,1 ); +if (ret) { +drm_err (dev,"R0' did not become ready %d\n" , ret); +return ret; + } + }else { +usleep_range (r0_prime_remaining_us, + r0_prime_remaining_us +1000 ); + } + +/* +* DP HDCP Spec mandates the two more reattempt to read R0, incase +* of R0 mismatch. +*/ +for (i =0 ; i < tries; i++) { + ret =drm_hdcp_helper_hdcp1_validate_ri (data); +if (!ret) +break ; + } +if (ret) { +drm_err (dev,"Failed to match R0/R0', aborting HDCP %d\n" , ret); +return ret; + } + +if (repeater_present) +return drm_hdcp_helper_hdcp1_authenticate_downstream (data); + +drm_dbg_kms (dev,"HDCP is enabled (no repeater present)\n" ); +return 0 ; +} + +static int drm_hdcp_helper_hdcp1_enable (struct drm_hdcp_helper_data *data) +{ +struct drm_connector *connector = data->connector; +struct drm_device *dev = connector->dev; +int i, ret, tries =3 ; + +drm_dbg_kms (dev,"[%s:%d] HDCP is being enabled...\n" , connector->name, + connector->base.id); + +/* Incase of authentication failures, HDCP spec expects reauth. */ +for (i =0 ; i < tries; i++) { + ret =drm_hdcp_helper_hdcp1_authenticate (data); +if (!ret) +return 0 ; + +drm_dbg_kms (dev,"HDCP Auth failure (%d)\n" , ret); + +/* Ensuring HDCP encryption and signalling are stopped. */ + data->funcs->hdcp1_disable (data->connector); + } + +drm_err (dev,"HDCP authentication failed (%d tries/%d)\n" , tries, ret); +return ret; +} + +static inline +void drm_hdcp_helper_driver_lock (struct drm_hdcp_helper_data *data) +{ +if (data->driver_mutex) +mutex_lock (data->driver_mutex); +} + +static inline +void drm_hdcp_helper_driver_unlock (struct drm_hdcp_helper_data *data) +{ +if (data->driver_mutex) +mutex_unlock (data->driver_mutex); +} + +static int drm_hdcp_helper_enable_hdcp (struct drm_hdcp_helper_data *data, +struct drm_atomic_state *state, +struct mutex *driver_mutex) +{ +struct drm_connector *connector = data->connector; +struct drm_connector_state *conn_state; +struct drm_device *dev = connector->dev; +unsigned long check_link_interval =DRM_HDCP2_CHECK_PERIOD_MS ; +bool capable; +int ret =0 ; + + conn_state =drm_atomic_get_new_connector_state (state, connector); + +mutex_lock (&data->mutex); + +if (data->value ==DRM_MODE_CONTENT_PROTECTION_ENABLED ) { +drm_hdcp_update_value (data,DRM_MODE_CONTENT_PROTECTION_ENABLED , + true); + goto out_data_mutex; + } + +drm_WARN_ON (dev, data->driver_mutex !=NULL ); + data->driver_mutex = driver_mutex; + +drm_hdcp_helper_driver_lock (data); + +if (data->funcs->setup) { + ret = data->funcs->setup (connector, state); +if (ret) { +drm_err (dev,"Failed to setup HDCP %d\n" , ret); + goto out; + } + } + +if (!data->funcs->are_keys_valid || + !data->funcs->are_keys_valid (connector)) { +if (data->funcs->load_keys) { + ret = data->funcs->load_keys (connector); +if (ret) { +drm_err (dev,"Failed to load HDCP keys %d\n" , ret); + goto out; + } + } + } + +/* +* 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. +*/ + ret = data->funcs->hdcp2_capable (connector, &capable); +if (ret) { +drm_err (dev,"HDCP 2.x capability check failed %d\n" , ret); + goto out; + } +if (capable) { + data->enabled_type =DRM_MODE_HDCP_CONTENT_TYPE1 ; + ret = data->funcs->hdcp2_enable (connector); +if (!ret) { + check_link_interval =DRM_HDCP2_CHECK_PERIOD_MS ; + goto out; + } + } + +/* +* When HDCP2.2 fails and Content Type is not Type1, HDCP1.4 will +* be attempted. +*/ + ret =drm_hdcp_helper_hdcp1_capable (data, &capable); +if (ret) { +drm_err (dev,"HDCP 1.x capability check failed %d\n" , ret); + goto out; + } +if (capable && conn_state->content_type !=DRM_MODE_HDCP_CONTENT_TYPE1 ) { + data->enabled_type =DRM_MODE_HDCP_CONTENT_TYPE0 ; + ret =drm_hdcp_helper_hdcp1_enable (data); +if (!ret) + check_link_interval =DRM_HDCP_CHECK_PERIOD_MS ; + } + +out: +if (!ret) { +schedule_delayed_work (&data->check_work, check_link_interval); +drm_hdcp_update_value (data,DRM_MODE_CONTENT_PROTECTION_ENABLED , + true); + } + +drm_hdcp_helper_driver_unlock (data); +if (ret) + data->driver_mutex =NULL ; + +out_data_mutex: +mutex_unlock (&data->mutex); +return ret; +} + +static int drm_hdcp_helper_disable_hdcp (struct drm_hdcp_helper_data *data) +{ +int ret =0 ; + +mutex_lock (&data->mutex); +drm_hdcp_helper_driver_lock (data); + +if (data->value ==DRM_MODE_CONTENT_PROTECTION_UNDESIRED ) + goto out; + +drm_dbg_kms (data->connector->dev,"[%s:%d] HDCP is being disabled...\n" , + data->connector->name, data->connector->base.id); + +drm_hdcp_update_value (data,DRM_MODE_CONTENT_PROTECTION_UNDESIRED , true); + +if (data->enabled_type ==DRM_MODE_HDCP_CONTENT_TYPE1 ) + ret = data->funcs->hdcp2_disable (data->connector); +else + ret = data->funcs->hdcp1_disable (data->connector); + +drm_dbg_kms (data->connector->dev,"HDCP is disabled\n" ); + +out: +drm_hdcp_helper_driver_unlock (data); + data->driver_mutex =NULL ; +mutex_unlock (&data->mutex); +cancel_delayed_work_sync (&data->check_work); +return ret; +} + +/** +* drm_hdcp_helper_atomic_commit - Helper for drivers to call during commit to +* enable/disable HDCP +* +* @data: pointer to the @drm_hdcp_helper_data for the connector +* @state: pointer to the atomic state being committed +* @driver_mutex: driver-provided lock to be used while interacting with the driver +* +* This function can be used by display drivers to determine when HDCP should be +* enabled or disabled based on the connector state. It should be called during +* steady-state commits as well as connector enable/disable. The function will +* handle the HDCP authentication/encryption logic, calling back into the driver +* when source operations are necessary. +* +* @driver_mutex will be retained and used for the duration of the HDCP session +* since it will be needed for link checks and retries. This mutex is useful if +* the driver has shared resources across connectors which must be serialized. +* For example, driver_mutex can be used for MST connectors sharing a common +* encoder which should not be accessed/changed concurrently. When the +* connector's session is torn down, the mutex will be forgotten by the helper +* for this connector until the next session. +*/ +void drm_hdcp_helper_atomic_commit (struct drm_hdcp_helper_data *data, +struct drm_atomic_state *state, +struct mutex *driver_mutex) +{ +struct drm_connector *connector = data->connector; +struct drm_connector_state *conn_state; +bool type_changed; + + conn_state =drm_atomic_get_new_connector_state (state, connector); + + type_changed = conn_state->hdcp_content_type != data->enabled_type; + +if (conn_state->content_protection ==DRM_MODE_CONTENT_PROTECTION_UNDESIRED ) { +drm_hdcp_helper_disable_hdcp (data); +return ; + } + +if (!conn_state->crtc) { +drm_hdcp_helper_disable_hdcp (data); + +/* Restore property to DESIRED so it's retried later */ +if (conn_state->content_protection ==DRM_MODE_CONTENT_PROTECTION_ENABLED ) { +mutex_lock (&data->mutex); +drm_hdcp_update_value (data,DRM_MODE_CONTENT_PROTECTION_DESIRED , + true); +mutex_unlock (&data->mutex); + } +return ; + } + +/* Already enabled */ +if (conn_state->content_protection ==DRM_MODE_CONTENT_PROTECTION_ENABLED ) +return ; + +/* Disable and re-enable HDCP on content type change */ +if (type_changed) +drm_hdcp_helper_disable_hdcp (data); + +drm_hdcp_helper_enable_hdcp (data, state, driver_mutex); +} +EXPORT_SYMBOL (drm_hdcp_helper_atomic_commit); + +static void drm_hdcp_helper_prop_work (struct work_struct *work) +{ +struct drm_hdcp_helper_data *data =container_of (work, + struct drm_hdcp_helper_data, + prop_work); +struct drm_connector *connector = data->connector; +struct drm_device *dev = connector->dev; + +drm_modeset_lock (&dev->mode_config.connection_mutex,NULL ); +mutex_lock (&data->mutex); + +/* +* This worker is only used to flip between ENABLED/DESIRED. Either of +* those to UNDESIRED is handled by core. If value == UNDESIRED, +* we're running just after hdcp has been disabled, so just exit +*/ +if (data->value !=DRM_MODE_CONTENT_PROTECTION_UNDESIRED ) +drm_hdcp_update_content_protection (connector, data->value); + +mutex_unlock (&data->mutex); +drm_modeset_unlock (&dev->mode_config.connection_mutex); +} + +static int drm_hdcp_hdcp1_check_link (struct drm_hdcp_helper_data *data) +{ +struct drm_connector *connector = data->connector; +struct drm_device *dev = connector->dev; +int ret; + +if (data->funcs->hdcp1_check_link) { + ret = data->funcs->hdcp1_check_link (connector); +if (ret) + goto retry; + } + +/* The link is checked differently for DP and HDMI */ +if (data->aux) { +u8 bstatus; + ret =drm_hdcp_remote_dpcd_read (data->aux,DP_AUX_HDCP_BSTATUS , + &bstatus,1 ); +if (ret) { +drm_err (dev,"Failed to read dpcd bstatus, %d\n" , ret); +return ret; + } +if (bstatus & (DP_BSTATUS_LINK_FAILURE |DP_BSTATUS_REAUTH_REQ )) + ret = -EINVAL ; + }else { + ret =drm_hdcp_helper_hdcp1_validate_ri (data); +if (ret) +drm_err (dev,"Ri' mismatch, check failed (%d)\n" , ret); + } +if (!ret) +return 0 ; + +retry: +drm_err (dev,"[%s:%d] HDCP link failed, retrying authentication\n" , + connector->name, connector->base.id); + + ret = data->funcs->hdcp1_disable (connector); +if (ret) { +drm_err (dev,"Failed to disable hdcp (%d)\n" , ret); +drm_hdcp_update_value (data,DRM_MODE_CONTENT_PROTECTION_DESIRED , + true); +return ret; + } + + ret =drm_hdcp_helper_hdcp1_enable (data); +if (ret) { +drm_err (dev,"Failed to enable hdcp (%d)\n" , ret); +drm_hdcp_update_value (data,DRM_MODE_CONTENT_PROTECTION_DESIRED , + true); +return ret; + } + +return 0 ; +} + +static int drm_hdcp_hdcp2_check_link (struct drm_hdcp_helper_data *data) +{ +struct drm_connector *connector = data->connector; +struct drm_device *dev = connector->dev; +int ret; + + ret = data->funcs->hdcp2_check_link (connector); +if (!ret) +return 0 ; + +drm_err (dev,"[%s:%d] HDCP2 link failed, retrying authentication\n" , + connector->name, connector->base.id); + + ret = data->funcs->hdcp2_disable (connector); +if (ret) { +drm_err (dev,"Failed to disable hdcp2 (%d)\n" , ret); +drm_hdcp_update_value (data,DRM_MODE_CONTENT_PROTECTION_DESIRED , + true); +return ret; + } + + ret = data->funcs->hdcp2_enable (connector); +if (ret) { +drm_err (dev,"Failed to enable hdcp2 (%d)\n" , ret); +drm_hdcp_update_value (data,DRM_MODE_CONTENT_PROTECTION_DESIRED , + true); +return ret; + } + +return 0 ; +} + +static void drm_hdcp_helper_check_work (struct work_struct *work) +{ +struct drm_hdcp_helper_data *data =container_of (to_delayed_work (work), + struct drm_hdcp_helper_data, + check_work); +unsigned long check_link_interval; + +mutex_lock (&data->mutex); +if (data->value !=DRM_MODE_CONTENT_PROTECTION_ENABLED ) + goto out_data_mutex; + +drm_hdcp_helper_driver_lock (data); + +if (data->enabled_type ==DRM_MODE_HDCP_CONTENT_TYPE1 ) { +if (drm_hdcp_hdcp2_check_link (data)) + goto out; + check_link_interval =DRM_HDCP2_CHECK_PERIOD_MS ; + }else { +if (drm_hdcp_hdcp1_check_link (data)) + goto out; + check_link_interval =DRM_HDCP_CHECK_PERIOD_MS ; + } +schedule_delayed_work (&data->check_work, check_link_interval); + +out: +drm_hdcp_helper_driver_unlock (data); +out_data_mutex: +mutex_unlock (&data->mutex); +} + +/** +* drm_hdcp_helper_schedule_hdcp_check - Schedule a check link cycle. +* +* @data: Pointer to the HDCP helper data. +* +* This function will kick off a check link cycle on behalf of the caller. This +* can be used by DP short hpd interrupt handlers, where the driver must poke +* the helper to check the link is still valid. +*/ +void drm_hdcp_helper_schedule_hdcp_check (struct drm_hdcp_helper_data *data) +{ +schedule_delayed_work (&data->check_work,0 ); +} +EXPORT_SYMBOL (drm_hdcp_helper_schedule_hdcp_check); + +static struct drm_hdcp_helper_data * +drm_hdcp_helper_initialize (struct drm_connector *connector, +const struct drm_hdcp_helper_funcs *funcs, +bool attach_content_type_property) +{ +struct drm_hdcp_helper_data *out; +int ret; + + out =kzalloc (sizeof (*out),GFP_KERNEL ); +if (!out) +return ERR_PTR (-ENOMEM ); + + out->connector = connector; + out->funcs = funcs; + +mutex_init (&out->mutex); + out->value =DRM_MODE_CONTENT_PROTECTION_UNDESIRED ; + +INIT_DELAYED_WORK (&out->check_work, drm_hdcp_helper_check_work); +INIT_WORK (&out->prop_work, drm_hdcp_helper_prop_work); + + ret =drm_connector_attach_content_protection_property (connector, + attach_content_type_property); +if (ret) { +drm_hdcp_helper_destroy (out); +return ERR_PTR (ret); + } + +return out; +} + +/** +* drm_hdcp_helper_initialize_dp - Initializes the HDCP helpers for a +* DisplayPort connector +* +* @connector: pointer to the DisplayPort connector. +* @funcs: pointer to the vtable of HDCP helper funcs for this connector. +* @attach_content_type_property: True if the content_type property should be +* attached. +* +* This function intializes the HDCP helper for the given DisplayPort connector. +* This involves creating the Content Protection property as well as the Content +* Type property (if desired). Upon success, it will return a pointer to the +* HDCP helper data. Ownership of the underlaying memory is transfered to the +* caller and should be freed using drm_hdcp_helper_destroy(). +* +* Returns: +* Pointer to newly created HDCP helper data. PTR_ERR on failure. +*/ +struct drm_hdcp_helper_data * +drm_hdcp_helper_initialize_dp (struct drm_connector *connector, +struct drm_dp_aux *aux, +const struct drm_hdcp_helper_funcs *funcs, +bool attach_content_type_property) +{ +struct drm_hdcp_helper_data *out; + + out =drm_hdcp_helper_initialize (connector, funcs, + attach_content_type_property); +if (IS_ERR (out)) +return out; + + out->aux = aux; + out->hdcp1_lut = &drm_hdcp_hdcp1_dpcd_lut; + +return out; +} +EXPORT_SYMBOL (drm_hdcp_helper_initialize_dp); + +/** +* drm_hdcp_helper_initialize_hdmi - Initializes the HDCP helpers for an HDMI +* connector +* +* @connector: pointer to the HDMI connector. +* @funcs: pointer to the vtable of HDCP helper funcs for this connector. +* @attach_content_type_property: True if the content_type property should be +* attached. +* +* This function intializes the HDCP helper for the given HDMI connector. This +* involves creating the Content Protection property as well as the Content Type +* property (if desired). Upon success, it will return a pointer to the HDCP +* helper data. Ownership of the underlaying memory is transfered to the caller +* and should be freed using drm_hdcp_helper_destroy(). +* +* Returns: +* Pointer to newly created HDCP helper data. PTR_ERR on failure. +*/ +struct drm_hdcp_helper_data * +drm_hdcp_helper_initialize_hdmi (struct drm_connector *connector, +const struct drm_hdcp_helper_funcs *funcs, +bool attach_content_type_property) +{ +struct drm_hdcp_helper_data *out; + + out =drm_hdcp_helper_initialize (connector, funcs, + attach_content_type_property); +if (IS_ERR (out)) +return out; + + out->hdcp1_lut = &drm_hdcp_hdcp1_ddc_lut; + +return out; +} +EXPORT_SYMBOL (drm_hdcp_helper_initialize_hdmi); + +/** +* drm_hdcp_helper_destroy - Destroys the given HDCP helper data. +* +* @data: Pointer to the HDCP helper data. +* +* This function cleans up and destroys the HDCP helper data created by +* drm_hdcp_helper_initialize_dp() or drm_hdcp_helper_initialize_hdmi(). +*/ +void drm_hdcp_helper_destroy (struct drm_hdcp_helper_data *data) +{ +struct drm_connector *connector; + +if (!data) +return ; + + connector = data->connector; + +/* +* 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->dev, + connector->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 (&data->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->dev,work_pending (&data->prop_work)); + +kfree (data); +} +EXPORT_SYMBOL (drm_hdcp_helper_destroy);
include/drm/drm_hdcp.h +191 -0
212 lines not on this page · raw message
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Re: [Freedreno] [PATCH v3 04/14] drm/hdcp: Expand HDCP helper library for enable/disable/check
Quoted 27 lines · Sean Paul
From: Sean Paul <[email protected]>
This patch expands upon the HDCP helper library to manage HDCP enable, disable, and check.
Previous to this patch, the majority of the state management and sink interaction is tucked inside the Intel driver with the understanding that once a new platform supported HDCP we could make good decisions about what should be centralized. With the addition of HDCP support for Qualcomm, it's time to migrate the protocol-specific bits of HDCP authentication, key exchange, and link checks to the HDCP helper.
In terms of functionality, this migration is 1:1 with the Intel driver, however things are laid out a bit differently than with
intel_hdcp.c, which is why this is a separate patch from the i915 transition to the helper. On i915, the "shim" vtable is used to account for HDMI vs. DP vs. DP-MST differences whereas the helper library uses a LUT to account for the register offsets and a remote read function to route the messages. On i915, storing the sink information in the source is done inline whereas now we use the newdrm_hdcp_helper_funcsvtable to store and fetch information to/from source hw. Finally, instead of calling enable/disable directly from the driver, we'll leave that decision to the helper and by callingdrm_hdcp_helper_atomic_commit()from the driver. All told, this will centralize the protocol and state handling in the helper, ensuring we collect all of our bugs^Wlogic in one place.
Quoted 3 lines
Cc Abhinav Kumar <[email protected]>Acked-by Jani Nikula <[email protected]>Signed-off-by Sean Paul <[email protected]>
For vendors/chipsets supporting HW polling, this needs rework to skip the SW polling, as agreed this will be done in a follow up change. Hence,
Quoted 1,444 lines
Link:
https://patchwork.freedesktop.org/patch/msgid/[email protected]
#v1
Link:
https://patchwork.freedesktop.org/patch/msgid/[email protected]
#v2Changes in v2:
-Fixed set-but-unused variable identified by 0-day Changes in v3:(quoted diff) +0
-2-Fixed uninitialized variable warning identified by 0-day --- drivers/gpu/drm/drm_hdcp.c | 1103 ++++++++++++++++++++++++++++++++++++ include/drm/drm_hdcp.h | 191 +++++++ 2 files changed, 1294 insertions(+)drivers/gpu/drm/drm_hdcp.c +36
-0@@ -6,15 +6,20 @@* Ramalingam C <[email protected]> */ +#include <linux/delay.h> #include <linux/device.h> #include <linux/err.h> #include <linux/gfp.h> +#include <linux/i2c.h> +#include <linux/iopoll.h> #include <linux/export.h> #include <linux/slab.h> #include <linux/firmware.h> +#include <linux/workqueue.h> #include <drm/drm_atomic.h> #include <drm/drm_connector.h> +#include <drm/drm_dp_helper.h> #include <drm/drm_hdcp.h> #include <drm/drm_sysfs.h> #include <drm/drm_print.h> @@ -513,3 +518,1101 @@ bool drm_hdcp_atomic_check(struct drm_connector *connector, return old_hdcp != new_hdcp; }EXPORT_SYMBOL (drm_hdcp_atomic_check); + +struct drm_hdcp_helper_data { +struct mutex mutex; +struct mutex *driver_mutex; + +struct drm_connector *connector; +const struct drm_hdcp_helper_funcs *funcs; + +u64 value; +unsigned int enabled_type; + +struct delayed_work check_work; +struct work_struct prop_work; + +struct drm_dp_aux *aux; +const struct drm_hdcp_hdcp1_receiver_reg_lut *hdcp1_lut; +}; + +struct drm_hdcp_hdcp1_receiver_reg_lut { +unsigned int bksv; +unsigned int ri; +unsigned int aksv; +unsigned int an; +unsigned int ainfo; +unsigned int v[5 ]; +unsigned int bcaps; +unsigned int bcaps_mask_repeater_present; +unsigned int bstatus; +}; + +static const struct drm_hdcp_hdcp1_receiver_reg_lut
drm_hdcp_hdcp1_ddc_lut= {drivers/gpu/drm/drm_hdcp.c +14
-0+ .bksv = DRM_HDCP_DDC_BKSV, + .ri = DRM_HDCP_DDC_RI_PRIME, + .aksv = DRM_HDCP_DDC_AKSV, + .an = DRM_HDCP_DDC_AN, + .ainfo = DRM_HDCP_DDC_AINFO, + .v = { DRM_HDCP_DDC_V_PRIME(0), DRM_HDCP_DDC_V_PRIME(1), +DRM_HDCP_DDC_V_PRIME (2 ),DRM_HDCP_DDC_V_PRIME (3 ), + DRM_HDCP_DDC_V_PRIME(4) }, + .bcaps = DRM_HDCP_DDC_BCAPS, + .bcaps_mask_repeater_present = DRM_HDCP_DDC_BCAPS_REPEATER_PRESENT, + .bstatus = DRM_HDCP_DDC_BSTATUS, +}; + +static const struct drm_hdcp_hdcp1_receiver_reg_lut
drm_hdcp_hdcp1_dpcd_lut= {drivers/gpu/drm/drm_hdcp.c +14
-0+ .bksv = DP_AUX_HDCP_BKSV, + .ri = DP_AUX_HDCP_RI_PRIME, + .aksv = DP_AUX_HDCP_AKSV, + .an = DP_AUX_HDCP_AN, + .ainfo = DP_AUX_HDCP_AINFO, + .v = { DP_AUX_HDCP_V_PRIME(0), DP_AUX_HDCP_V_PRIME(1), +DP_AUX_HDCP_V_PRIME (2 ),DP_AUX_HDCP_V_PRIME (3 ), + DP_AUX_HDCP_V_PRIME(4) }, + .bcaps = DP_AUX_HDCP_BCAPS, + .bcaps_mask_repeater_present = DP_BCAPS_REPEATER_PRESENT, + +/* +* For some reason the HDMI and DP HDCP specs call this register +* definition by different names. In the HDMI spec, it's called BSTATUS,
drivers/gpu/drm/drm_hdcp.c +53
-0+* but in DP it's called BINFO. +*/ + .bstatus = DP_AUX_HDCP_BINFO, +}; + +static int drm_hdcp_remote_ddc_read (struct i2c_adapter *i2c, +unsigned int offset,u8 *value,size_t len) +{ +int ret; +u8 start = offset &0xff ; +struct i2c_msg msgs[] = { + { + .addr =DRM_HDCP_DDC_ADDR , + .flags =0 , + .len =1 , + .buf = &start, + }, + { + .addr =DRM_HDCP_DDC_ADDR , + .flags =I2C_M_RD , + .len = len, + .buf = value + } + }; + ret =i2c_transfer (i2c, msgs,ARRAY_SIZE (msgs)); +if (ret ==ARRAY_SIZE (msgs)) +return 0 ; +return ret >=0 ? -EIO : ret; +} + +static int drm_hdcp_remote_dpcd_read (struct drm_dp_aux *aux, +unsigned int offset,u8 *value, +size_t len) +{ +ssize_t ret; + + ret =drm_dp_dpcd_read (aux, offset, value, len); +if (ret != len) { +if (ret >=0 ) +return -EIO ; +return ret; + } + +return 0 ; +} + +static int drm_hdcp_remote_read (struct drm_hdcp_helper_data *data, +unsigned int offset,u8 *value,u8 len) +{ +if (data->aux) +return drm_hdcp_remote_dpcd_read (data->aux, offset, value, len); +else + return drm_hdcp_remote_ddc_read(data->connector->ddc, offset, value,len);
drivers/gpu/drm/drm_hdcp.c +90
-0+} + +static int drm_hdcp_remote_ddc_write (struct i2c_adapter *i2c, +unsigned int offset,u8 *buffer, +size_t size) +{ +int ret; +u8 *write_buf; +struct i2c_msg msg; + + write_buf =kzalloc (size +1 ,GFP_KERNEL ); +if (!write_buf) +return -ENOMEM ; + + write_buf[0 ] = offset &0xff ; +memcpy (&write_buf[1 ], buffer, size); + + msg.addr =DRM_HDCP_DDC_ADDR ; + msg.flags =0 , + msg.len = size +1 , + msg.buf = write_buf; + + ret =i2c_transfer (i2c, &msg,1 ); +if (ret ==1 ) + ret =0 ; +else if (ret >=0 ) + ret = -EIO ; + +kfree (write_buf); +return ret; +} + +static int drm_hdcp_remote_dpcd_write (struct drm_dp_aux *aux, +unsigned int offset,u8 *value, +size_t len) +{ +ssize_t ret; + + ret =drm_dp_dpcd_write (aux, offset, value, len); +if (ret != len) { +if (ret >=0 ) +return -EIO ; +return ret; + } + +return 0 ; +} + +static int drm_hdcp_remote_write (struct drm_hdcp_helper_data *data, +unsigned int offset,u8 *value,u8 len) +{ +if (data->aux) +return drm_hdcp_remote_dpcd_write (data->aux, offset, value, len); +else +return drm_hdcp_remote_ddc_write (data->connector->ddc, offset, + value, len); +} + +static bool drm_hdcp_is_ksv_valid (struct drm_hdcp_ksv *ksv) +{ +/* Valid Ksv has 20 0's and 20 1's */ +return hweight32 (ksv->words[0 ]) +hweight32 (ksv->words[1 ]) ==20 ; +} + +static int drm_hdcp_read_valid_bksv (struct drm_hdcp_helper_data *data, +struct drm_hdcp_ksv *bksv) +{ +int ret, i, tries =2 ; + +/* HDCP spec states that we must retry the bksv if it is invalid */ +for (i =0 ; i < tries; i++) { + ret =drm_hdcp_remote_read (data, data->hdcp1_lut->bksv, + bksv->bytes,DRM_HDCP_KSV_LEN ); +if (ret) +return ret; + +if (drm_hdcp_is_ksv_valid (bksv)) +break ; + } +if (i == tries) { +drm_dbg_kms (data->connector->dev,"Bksv is invalid %*ph\n" , +DRM_HDCP_KSV_LEN , bksv->bytes); +return -ENODEV ; + } + +return 0 ; +} + +/** +* drm_hdcp_helper_hdcp1_capable - Checks if the sink is capable of HDCP 1.x.
+ *
+ * @data: pointer to the HDCP helper data.
+ * @capable: pointer to a bool which will contain true if the sink is capable.
+ *
+ * Returns:
+ * -errno if the transacation between source and sink fails.
+ */drivers/gpu/drm/drm_hdcp.c +38
-0+int drm_hdcp_helper_hdcp1_capable (struct drm_hdcp_helper_data *data, +bool *capable) +{ +/* +* DisplayPort has a dedicated bit for this in DPCD whereas HDMI spec +* states that transmitters should use bksv to determine capability. +*/ +if (data->aux) { +int ret; +u8 bcaps; + + ret =drm_hdcp_remote_read (data, data->hdcp1_lut->bcaps, + &bcaps,1 ); + *capable = !ret && (bcaps &DP_BCAPS_HDCP_CAPABLE ); + }else { +struct drm_hdcp_ksv bksv; + + *capable =drm_hdcp_read_valid_bksv (data, &bksv) ==0 ; + } + +return 0 ; +} +EXPORT_SYMBOL (drm_hdcp_helper_hdcp1_capable); + +static void drm_hdcp_update_value (struct drm_hdcp_helper_data *data, +u64 value,bool update_property) +{ +WARN_ON (!mutex_is_locked (&data->mutex)); + + data->value = value; +if (update_property) { +drm_connector_get (data->connector); +schedule_work (&data->prop_work); + } +} + +static int +drm_hdcp_helper_hdcp1_ksv_fifo_ready(struct drm_hdcp_helper_data*data)
drivers/gpu/drm/drm_hdcp.c +5
-0+{ +int ret; +u8 val, mask; + +/* KSV FIFO ready bit is stored in different locations on DP v. HDMI */
drivers/gpu/drm/drm_hdcp.c +19
-0+if (data->aux) { + ret =drm_hdcp_remote_dpcd_read (data->aux,DP_AUX_HDCP_BSTATUS , + &val,1 ); + mask =DP_BSTATUS_READY ; + }else { + ret =drm_hdcp_remote_ddc_read (data->connector->ddc, +DRM_HDCP_DDC_BCAPS , &val,1 ); + mask =DRM_HDCP_DDC_BCAPS_KSV_FIFO_READY ; + } +if (ret) +return ret; +if (val & mask) +return 0 ; + +return -EAGAIN ; +} + +static int +drm_hdcp_helper_hdcp1_read_ksv_fifo(struct drm_hdcp_helper_data*data, u8 *fifo,
drivers/gpu/drm/drm_hdcp.c +32
-0+ u8 num_downstream) +{ +struct drm_device *dev = data->connector->dev; +int ret, i; + +/* Over HDMI, read the whole thing at once */ +if (data->connector->ddc) { + ret =drm_hdcp_remote_ddc_read (data->connector->ddc, +DRM_HDCP_DDC_KSV_FIFO , fifo, + num_downstream *DRM_HDCP_KSV_LEN ); +if (ret) +drm_err (dev,"DDC ksv fifo read failed (%d)\n" , ret); +return ret; + } + +/* Over DP, read via 15 byte window (3 entries @ 5 bytes each) */ +for (i =0 ; i < num_downstream; i +=3 ) { +size_t len =min (num_downstream - i,3 ) *DRM_HDCP_KSV_LEN ; + ret =drm_hdcp_remote_dpcd_read (data->aux,DP_AUX_HDCP_KSV_FIFO , + fifo + i *DRM_HDCP_KSV_LEN , + len); +if (ret) { +drm_err (dev,"Read ksv[%d] from DP/AUX failed (%d)\n" , + i, ret); +return ret; + } + } + +return 0 ; +} + +static int drm_hdcp_helper_hdcp1_read_v_prime(struct
drm_hdcp_helper_data*data,drivers/gpu/drm/drm_hdcp.c +19
-0+ u32 *v_prime) +{ +struct drm_device *dev = data->connector->dev; +int ret, i; + +for (i =0 ; i <DRM_HDCP_V_PRIME_NUM_PARTS ; i++) { + ret =drm_hdcp_remote_read (data, data->hdcp1_lut->v[i], + (u8 *)&v_prime[i], +DRM_HDCP_V_PRIME_PART_LEN ); +if (ret) { +drm_dbg_kms (dev,"Read v'[%d] from failed (%d)\n" , i, ret); +return ret >=0 ? -EIO : ret; + } + } +return 0 ; +} + +static int +drm_hdcp_helper_hdcp1_authenticate_downstream(struct
drm_hdcp_helper_data*data)drivers/gpu/drm/drm_hdcp.c +9
-0+{ +struct drm_connector *connector = data->connector; +struct drm_device *dev = connector->dev; +u32 v_prime[DRM_HDCP_V_PRIME_NUM_PARTS ]; +u8 bstatus[DRM_HDCP_BSTATUS_LEN ]; +u8 num_downstream, *ksv_fifo; +int ret, i, tries =3 ; + + ret = read_poll_timeout(drm_hdcp_helper_hdcp1_ksv_fifo_ready, ret,!ret,
drivers/gpu/drm/drm_hdcp.c +13
-0+ 10 * 1000, 5 * 1000 * 1000, false, data); +if (ret) { +drm_err (dev,"Failed to poll ksv ready, %d\n" , ret); +return ret; + } + + ret =drm_hdcp_remote_read (data, data->hdcp1_lut->bstatus, + bstatus,DRM_HDCP_BSTATUS_LEN ); +if (ret) +return ret; + +/* +* When repeater reports 0 device count, HDCP1.4 spec allows disabling
drivers/gpu/drm/drm_hdcp.c +58
-0+* 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 ]); +if (num_downstream ==0 ) { +drm_err (dev,"Repeater with zero downstream devices, %*ph\n" , +DRM_HDCP_BSTATUS_LEN , bstatus); +return -EINVAL ; + } + + ksv_fifo =kcalloc (DRM_HDCP_KSV_LEN , num_downstream,GFP_KERNEL ); +if (!ksv_fifo) +return -ENOMEM ; + + ret =drm_hdcp_helper_hdcp1_read_ksv_fifo (data, ksv_fifo, + num_downstream); +if (ret) { +drm_err (dev,"Failed to read ksv fifo, %d/%d\n" , num_downstream, + ret); + goto out; + } + +if (drm_hdcp_check_ksvs_revoked (dev, ksv_fifo, num_downstream)) { +drm_err (dev,"Revoked Ksv(s) in ksv_fifo\n" ); + ret = -EPERM ; + goto out; + } + +/* +* When V prime mismatches, DP Spec mandates re-read of +* V prime atleast twice. +*/ +for (i =0 ; i < tries; i++) { + ret =drm_hdcp_helper_hdcp1_read_v_prime (data, v_prime); +if (ret) +continue ; + + ret = data->funcs->hdcp1_store_ksv_fifo (connector, ksv_fifo, + num_downstream, + bstatus, v_prime); +if (!ret) +break ; + } +if (ret) +drm_err (dev,"Could not validate KSV FIFO with V' %d\n" , ret); + +out: +if (!ret) +drm_dbg_kms (dev,"HDCP is enabled (%d downstream devices)\n" , + num_downstream); + +kfree (ksv_fifo); +return ret; +} + +static int drm_hdcp_helper_hdcp1_validate_ri(struct
drm_hdcp_helper_data*data)drivers/gpu/drm/drm_hdcp.c +20
-0+{ +union { +u32 word; +u8 bytes[DRM_HDCP_RI_LEN ]; + } ri_prime = { .word =0 }; +struct drm_connector *connector = data->connector; +struct drm_device *dev = connector->dev; +int ret; + + ret =drm_hdcp_remote_read (data, data->hdcp1_lut->ri, ri_prime.bytes, +DRM_HDCP_RI_LEN ); +if (ret) { +drm_err (dev,"Failed to read R0' %d\n" , ret); +return ret; + } + +return data->funcs->hdcp1_match_ri (connector, ri_prime.word); +} + +static int drm_hdcp_helper_hdcp1_authenticate(struct
drm_hdcp_helper_data*data)drivers/gpu/drm/drm_hdcp.c +9
-0+{ +union { +u32 word; +u8 bytes[DRM_HDCP_BSTATUS_LEN ]; + } bstatus; +const struct drm_hdcp_helper_funcs *funcs = data->funcs; +struct drm_connector *connector = data->connector; +struct drm_device *dev = connector->dev; + unsigned long r0_prime_timeout, r0_prime_remaining_us = 0,
tmp_jiffies;drivers/gpu/drm/drm_hdcp.c +37
-0+struct drm_hdcp_ksv aksv; +struct drm_hdcp_ksv bksv; +struct drm_hdcp_an an; +bool repeater_present; +int ret, i, tries =3 ; +u8 bcaps; + +if (funcs->hdcp1_read_an_aksv) { + ret = funcs->hdcp1_read_an_aksv (connector, an.words, aksv.words); +if (ret) { +drm_err (dev,"Failed to read An/Aksv values, %d\n" , ret); +return ret; + } + + ret =drm_hdcp_remote_write (data, data->hdcp1_lut->an, an.bytes, +DRM_HDCP_AN_LEN ); +if (ret) { +drm_err (dev,"Failed to write An to receiver, %d\n" , ret); +return ret; + } + + ret =drm_hdcp_remote_write (data, data->hdcp1_lut->aksv, aksv.bytes, +DRM_HDCP_KSV_LEN ); +if (ret) { +drm_err (dev,"Failed to write Aksv to receiver, %d\n" , ret); +return ret; + } + }else { + ret = funcs->hdcp1_send_an_aksv (connector); +if (ret) { +drm_err (dev,"Failed to read An/Aksv values, %d\n" , ret); +return ret; + } + } + +/* +* Timeout for R0' to become available. The spec says 100ms from Aksv,
drivers/gpu/drm/drm_hdcp.c +1
-0+* but some monitors can take longer than this. We'll set the timeout at
drivers/gpu/drm/drm_hdcp.c +34
-0+* 300ms just to be sure. +*/ + r0_prime_timeout = jiffies +msecs_to_jiffies (300 ); + +memset (&bksv,0 ,sizeof (bksv)); + + ret =drm_hdcp_read_valid_bksv (data, &bksv); +if (ret <0 ) +return ret; + +if (drm_hdcp_check_ksvs_revoked (dev, bksv.bytes,1 )) { +drm_err (dev,"BKSV is revoked\n" ); +return -EPERM ; + } + + ret =drm_hdcp_remote_read (data, data->hdcp1_lut->bcaps, &bcaps,1 ); +if (ret) +return ret; + +memset (&bstatus,0 ,sizeof (bstatus)); + + ret =drm_hdcp_remote_read (data, data->hdcp1_lut->bstatus, + bstatus.bytes,DRM_HDCP_BSTATUS_LEN ); +if (ret) +return ret; + +if (DRM_HDCP_MAX_DEVICE_EXCEEDED (bstatus.bytes[0 ]) || +DRM_HDCP_MAX_CASCADE_EXCEEDED (bstatus.bytes[1 ])) { +drm_err (dev,"Max Topology Limit Exceeded, bstatus=%*ph\n" , +DRM_HDCP_BSTATUS_LEN , bstatus.bytes); +return -EPERM ; + } + + repeater_present = bcaps &
data->hdcp1_lut->bcaps_mask_repeater_present;drivers/gpu/drm/drm_hdcp.c +20
-0+ + ret = funcs->hdcp1_store_receiver_info (connector, bksv.words, + bstatus.word, bcaps, + repeater_present); +if (ret) { +drm_err (dev,"Failed to store bksv, %d\n" , ret); +return ret; + } + + ret = funcs->hdcp1_enable_encryption (connector); +if (ret) +return ret; + + ret = funcs->hdcp1_wait_for_r0 (connector); +if (ret) +return ret; + + tmp_jiffies = jiffies; +if (time_before (tmp_jiffies, r0_prime_timeout)) + r0_prime_remaining_us = jiffies_to_usecs(r0_prime_timeout -
tmp_jiffies);drivers/gpu/drm/drm_hdcp.c +45
-0+ +/* +* Wait for R0' to become available. +* +* On DP, there's an R0_READY bit available but no such bit +* exists on HDMI. So poll the ready bit for DP and just wait the +* remainder of the 300 ms timeout for HDMI. +*/ +if (data->aux) { +u8 val; + ret =read_poll_timeout (drm_hdcp_remote_dpcd_read, ret, + !ret && (val &DP_BSTATUS_R0_PRIME_READY ), +1000 , r0_prime_remaining_us, false, + data->aux,DP_AUX_HDCP_BSTATUS , &val,1 ); +if (ret) { +drm_err (dev,"R0' did not become ready %d\n" , ret); +return ret; + } + }else { +usleep_range (r0_prime_remaining_us, + r0_prime_remaining_us +1000 ); + } + +/* +* DP HDCP Spec mandates the two more reattempt to read R0, incase +* of R0 mismatch. +*/ +for (i =0 ; i < tries; i++) { + ret =drm_hdcp_helper_hdcp1_validate_ri (data); +if (!ret) +break ; + } +if (ret) { +drm_err (dev,"Failed to match R0/R0', aborting HDCP %d\n" , ret); +return ret; + } + +if (repeater_present) +return drm_hdcp_helper_hdcp1_authenticate_downstream (data); + +drm_dbg_kms (dev,"HDCP is enabled (no repeater present)\n" ); +return 0 ; +} + +static int drm_hdcp_helper_hdcp1_enable(struct drm_hdcp_helper_data*data)
drivers/gpu/drm/drm_hdcp.c +6
-0+{ +struct drm_connector *connector = data->connector; +struct drm_device *dev = connector->dev; +int i, ret, tries =3 ; + + drm_dbg_kms(dev, "[%s:%d] HDCP is being enabled...\n",
connector->name,drivers/gpu/drm/drm_hdcp.c +15
-0+ connector->base.id); + +/* Incase of authentication failures, HDCP spec expects reauth. */ +for (i =0 ; i < tries; i++) { + ret =drm_hdcp_helper_hdcp1_authenticate (data); +if (!ret) +return 0 ; + +drm_dbg_kms (dev,"HDCP Auth failure (%d)\n" , ret); + +/* Ensuring HDCP encryption and signalling are stopped. */ + data->funcs->hdcp1_disable (data->connector); + } + + drm_err(dev, "HDCP authentication failed (%d tries/%d)\n", tries,ret);
drivers/gpu/drm/drm_hdcp.c +18
-0+return ret; +} + +static inline +void drm_hdcp_helper_driver_lock (struct drm_hdcp_helper_data *data) +{ +if (data->driver_mutex) +mutex_lock (data->driver_mutex); +} + +static inline +void drm_hdcp_helper_driver_unlock (struct drm_hdcp_helper_data *data) +{ +if (data->driver_mutex) +mutex_unlock (data->driver_mutex); +} + +static int drm_hdcp_helper_enable_hdcp(struct drm_hdcp_helper_data*data,
drivers/gpu/drm/drm_hdcp.c +72
-0+struct drm_atomic_state *state, + struct mutex *driver_mutex) +{ + struct drm_connector *connector = data->connector; +struct drm_connector_state *conn_state; +struct drm_device *dev = connector->dev; +unsigned long check_link_interval =DRM_HDCP2_CHECK_PERIOD_MS ; +bool capable; +int ret =0 ; + + conn_state =drm_atomic_get_new_connector_state (state, connector); + +mutex_lock (&data->mutex); + +if (data->value ==DRM_MODE_CONTENT_PROTECTION_ENABLED ) { +drm_hdcp_update_value (data,DRM_MODE_CONTENT_PROTECTION_ENABLED , + true); + goto out_data_mutex; + } + +drm_WARN_ON (dev, data->driver_mutex !=NULL ); + data->driver_mutex = driver_mutex; + +drm_hdcp_helper_driver_lock (data); + +if (data->funcs->setup) { + ret = data->funcs->setup (connector, state); +if (ret) { +drm_err (dev,"Failed to setup HDCP %d\n" , ret); + goto out; + } + } + +if (!data->funcs->are_keys_valid || + !data->funcs->are_keys_valid (connector)) { +if (data->funcs->load_keys) { + ret = data->funcs->load_keys (connector); +if (ret) { +drm_err (dev,"Failed to load HDCP keys %d\n" , ret); + goto out; + } + } + } + +/* +* 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. +*/ + ret = data->funcs->hdcp2_capable (connector, &capable); +if (ret) { +drm_err (dev,"HDCP 2.x capability check failed %d\n" , ret); + goto out; + } +if (capable) { + data->enabled_type =DRM_MODE_HDCP_CONTENT_TYPE1 ; + ret = data->funcs->hdcp2_enable (connector); +if (!ret) { + check_link_interval =DRM_HDCP2_CHECK_PERIOD_MS ; + goto out; + } + } + +/* +* When HDCP2.2 fails and Content Type is not Type1, HDCP1.4 will +* be attempted. +*/ + ret =drm_hdcp_helper_hdcp1_capable (data, &capable); +if (ret) { +drm_err (dev,"HDCP 1.x capability check failed %d\n" , ret); + goto out; + } + if (capable && conn_state->content_type !=
DRM_MODE_HDCP_CONTENT_TYPE1) {drivers/gpu/drm/drm_hdcp.c +23
-0+ data->enabled_type =DRM_MODE_HDCP_CONTENT_TYPE0 ; + ret =drm_hdcp_helper_hdcp1_enable (data); +if (!ret) + check_link_interval =DRM_HDCP_CHECK_PERIOD_MS ; + } + +out: +if (!ret) { +schedule_delayed_work (&data->check_work, check_link_interval); +drm_hdcp_update_value (data,DRM_MODE_CONTENT_PROTECTION_ENABLED , + true); + } + +drm_hdcp_helper_driver_unlock (data); +if (ret) + data->driver_mutex =NULL ; + +out_data_mutex: +mutex_unlock (&data->mutex); +return ret; +} + +static int drm_hdcp_helper_disable_hdcp(struct drm_hdcp_helper_data*data)
drivers/gpu/drm/drm_hdcp.c +10
-0+{ +int ret =0 ; + +mutex_lock (&data->mutex); +drm_hdcp_helper_driver_lock (data); + +if (data->value ==DRM_MODE_CONTENT_PROTECTION_UNDESIRED ) + goto out; + + drm_dbg_kms(data->connector->dev, "[%s:%d] HDCP is beingdisabled...\n",
drivers/gpu/drm/drm_hdcp.c +3
-0+ data->connector->name, data->connector->base.id); + + drm_hdcp_update_value(data, DRM_MODE_CONTENT_PROTECTION_UNDESIRED,true);
drivers/gpu/drm/drm_hdcp.c +18
-0+ +if (data->enabled_type ==DRM_MODE_HDCP_CONTENT_TYPE1 ) + ret = data->funcs->hdcp2_disable (data->connector); +else + ret = data->funcs->hdcp1_disable (data->connector); + +drm_dbg_kms (data->connector->dev,"HDCP is disabled\n" ); + +out: +drm_hdcp_helper_driver_unlock (data); + data->driver_mutex =NULL ; +mutex_unlock (&data->mutex); +cancel_delayed_work_sync (&data->check_work); +return ret; +} + +/** +* drm_hdcp_helper_atomic_commit - Helper for drivers to call during commit to
+ * enable/disable HDCP
+ *
+ * @data: pointer to the @drm_hdcp_helper_data for the connector
+ * @state: pointer to the atomic state being committed
+ * @driver_mutex: driver-provided lock to be used while interacting with the driver
+ *
+ * This function can be used by display drivers to determine when HDCP should be
+ * enabled or disabled based on the connector state. It should be called during
+ * steady-state commits as well as connector enable/disable. The function will
+ * handle the HDCP authentication/encryption logic, calling back into the driver
+ * when source operations are necessary.
+ *
+ * @driver_mutex will be retained and used for the duration of the HDCP session
+ * since it will be needed for link checks and retries. This mutex is useful if
+ * the driver has shared resources across connectors which must be serialized.
+ * For example,driver_mutexcan be used for MST connectors sharing a common
+ * encoder which should not be accessed/changed concurrently. When the
+ * connector's session is torn down, the mutex will be forgotten by the helper
+ * for this connector until the next session.
+ */drivers/gpu/drm/drm_hdcp.c +13
-0+void drm_hdcp_helper_atomic_commit (struct drm_hdcp_helper_data *data, +struct drm_atomic_state *state, +struct mutex *driver_mutex) +{ +struct drm_connector *connector = data->connector; +struct drm_connector_state *conn_state; +bool type_changed; + + conn_state =drm_atomic_get_new_connector_state (state, connector); + + type_changed = conn_state->hdcp_content_type != data->enabled_type; + + if (conn_state->content_protection ==
DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {drivers/gpu/drm/drm_hdcp.c +9
-0+drm_hdcp_helper_disable_hdcp (data); +return ; + } + +if (!conn_state->crtc) { +drm_hdcp_helper_disable_hdcp (data); + +/* Restore property to DESIRED so it's retried later */ + if (conn_state->content_protection ==
DRM_MODE_CONTENT_PROTECTION_ENABLED) {drivers/gpu/drm/drm_hdcp.c +10
-0+mutex_lock (&data->mutex); +drm_hdcp_update_value (data,DRM_MODE_CONTENT_PROTECTION_DESIRED , + true); +mutex_unlock (&data->mutex); + } +return ; + } + +/* Already enabled */ + if (conn_state->content_protection ==
DRM_MODE_CONTENT_PROTECTION_ENABLED)drivers/gpu/drm/drm_hdcp.c +23
-0+return ; + +/* Disable and re-enable HDCP on content type change */ +if (type_changed) +drm_hdcp_helper_disable_hdcp (data); + +drm_hdcp_helper_enable_hdcp (data, state, driver_mutex); +} +EXPORT_SYMBOL (drm_hdcp_helper_atomic_commit); + +static void drm_hdcp_helper_prop_work (struct work_struct *work) +{ +struct drm_hdcp_helper_data *data =container_of (work, + struct drm_hdcp_helper_data, + prop_work); +struct drm_connector *connector = data->connector; +struct drm_device *dev = connector->dev; + +drm_modeset_lock (&dev->mode_config.connection_mutex,NULL ); +mutex_lock (&data->mutex); + +/* +* This worker is only used to flip between ENABLED/DESIRED. Either of
drivers/gpu/drm/drm_hdcp.c +11
-0+* those to UNDESIRED is handled by core. If value == UNDESIRED, +* we're running just after hdcp has been disabled, so just exit +*/ +if (data->value !=DRM_MODE_CONTENT_PROTECTION_UNDESIRED ) +drm_hdcp_update_content_protection (connector, data->value); + +mutex_unlock (&data->mutex); +drm_modeset_unlock (&dev->mode_config.connection_mutex); +} + +static int drm_hdcp_hdcp1_check_link(struct drm_hdcp_helper_data*data)
drivers/gpu/drm/drm_hdcp.c +54
-0+{ +struct drm_connector *connector = data->connector; +struct drm_device *dev = connector->dev; +int ret; + +if (data->funcs->hdcp1_check_link) { + ret = data->funcs->hdcp1_check_link (connector); +if (ret) + goto retry; + } + +/* The link is checked differently for DP and HDMI */ +if (data->aux) { +u8 bstatus; + ret =drm_hdcp_remote_dpcd_read (data->aux,DP_AUX_HDCP_BSTATUS , + &bstatus,1 ); +if (ret) { +drm_err (dev,"Failed to read dpcd bstatus, %d\n" , ret); +return ret; + } +if (bstatus & (DP_BSTATUS_LINK_FAILURE |DP_BSTATUS_REAUTH_REQ )) + ret = -EINVAL ; + }else { + ret =drm_hdcp_helper_hdcp1_validate_ri (data); +if (ret) +drm_err (dev,"Ri' mismatch, check failed (%d)\n" , ret); + } +if (!ret) +return 0 ; + +retry: +drm_err (dev,"[%s:%d] HDCP link failed, retrying authentication\n" , + connector->name, connector->base.id); + + ret = data->funcs->hdcp1_disable (connector); +if (ret) { +drm_err (dev,"Failed to disable hdcp (%d)\n" , ret); +drm_hdcp_update_value (data,DRM_MODE_CONTENT_PROTECTION_DESIRED , + true); +return ret; + } + + ret =drm_hdcp_helper_hdcp1_enable (data); +if (ret) { +drm_err (dev,"Failed to enable hdcp (%d)\n" , ret); +drm_hdcp_update_value (data,DRM_MODE_CONTENT_PROTECTION_DESIRED , + true); +return ret; + } + +return 0 ; +} + +static int drm_hdcp_hdcp2_check_link(struct drm_hdcp_helper_data*data)
drivers/gpu/drm/drm_hdcp.c +34
-0+{ +struct drm_connector *connector = data->connector; +struct drm_device *dev = connector->dev; +int ret; + + ret = data->funcs->hdcp2_check_link (connector); +if (!ret) +return 0 ; + +drm_err (dev,"[%s:%d] HDCP2 link failed, retrying authentication\n" , + connector->name, connector->base.id); + + ret = data->funcs->hdcp2_disable (connector); +if (ret) { +drm_err (dev,"Failed to disable hdcp2 (%d)\n" , ret); +drm_hdcp_update_value (data,DRM_MODE_CONTENT_PROTECTION_DESIRED , + true); +return ret; + } + + ret = data->funcs->hdcp2_enable (connector); +if (ret) { +drm_err (dev,"Failed to enable hdcp2 (%d)\n" , ret); +drm_hdcp_update_value (data,DRM_MODE_CONTENT_PROTECTION_DESIRED , + true); +return ret; + } + +return 0 ; +} + +static void drm_hdcp_helper_check_work (struct work_struct *work) +{ + struct drm_hdcp_helper_data *data =container_of(to_delayed_work(work),
drivers/gpu/drm/drm_hdcp.c +33
-0+ struct drm_hdcp_helper_data, + check_work); +unsigned long check_link_interval; + +mutex_lock (&data->mutex); +if (data->value !=DRM_MODE_CONTENT_PROTECTION_ENABLED ) + goto out_data_mutex; + +drm_hdcp_helper_driver_lock (data); + +if (data->enabled_type ==DRM_MODE_HDCP_CONTENT_TYPE1 ) { +if (drm_hdcp_hdcp2_check_link (data)) + goto out; + check_link_interval =DRM_HDCP2_CHECK_PERIOD_MS ; + }else { +if (drm_hdcp_hdcp1_check_link (data)) + goto out; + check_link_interval =DRM_HDCP_CHECK_PERIOD_MS ; + } +schedule_delayed_work (&data->check_work, check_link_interval); + +out: +drm_hdcp_helper_driver_unlock (data); +out_data_mutex: +mutex_unlock (&data->mutex); +} + +/** +* drm_hdcp_helper_schedule_hdcp_check - Schedule a check link cycle. +* +* @data: Pointer to the HDCP helper data. +* +* This function will kick off a check link cycle on behalf of the caller. This
+ * can be used by DP short hpd interrupt handlers, where the driver must poke
+ * the helper to check the link is still valid.
+ */
+voiddrm_hdcp_helper_schedule_hdcp_check(struct drm_hdcp_helper_data *data)drivers/gpu/drm/drm_hdcp.c +42
-0+{ +schedule_delayed_work (&data->check_work,0 ); +} +EXPORT_SYMBOL (drm_hdcp_helper_schedule_hdcp_check); + +static struct drm_hdcp_helper_data * +drm_hdcp_helper_initialize (struct drm_connector *connector, +const struct drm_hdcp_helper_funcs *funcs, +bool attach_content_type_property) +{ +struct drm_hdcp_helper_data *out; +int ret; + + out =kzalloc (sizeof (*out),GFP_KERNEL ); +if (!out) +return ERR_PTR (-ENOMEM ); + + out->connector = connector; + out->funcs = funcs; + +mutex_init (&out->mutex); + out->value =DRM_MODE_CONTENT_PROTECTION_UNDESIRED ; + +INIT_DELAYED_WORK (&out->check_work, drm_hdcp_helper_check_work); +INIT_WORK (&out->prop_work, drm_hdcp_helper_prop_work); + + ret =drm_connector_attach_content_protection_property (connector, + attach_content_type_property); +if (ret) { +drm_hdcp_helper_destroy (out); +return ERR_PTR (ret); + } + +return out; +} + +/** +* drm_hdcp_helper_initialize_dp - Initializes the HDCP helpers for a +* DisplayPort connector +* +* @connector: pointer to the DisplayPort connector. +* @funcs: pointer to the vtable of HDCP helper funcs for this connector.
+ * @attach_content_type_property: True if thecontent_typeproperty should be
+ * attached.
+ *
+ * This function intializes the HDCP helper for the given DisplayPort connector.
+ * This involves creating the Content Protection property as well as the Content
+ * Type property (if desired). Upon success, it will return a pointer to the
+ * HDCP helper data. Ownership of the underlaying memory is transfered to the
+ * caller and should be freed usingdrm_hdcp_helper_destroy().
+ *
+ * Returns:
+ * Pointer to newly created HDCP helper data.PTR_ERRon failure.
+ */drivers/gpu/drm/drm_hdcp.c +22
-0+struct drm_hdcp_helper_data * +drm_hdcp_helper_initialize_dp (struct drm_connector *connector, +struct drm_dp_aux *aux, +const struct drm_hdcp_helper_funcs *funcs, +bool attach_content_type_property) +{ +struct drm_hdcp_helper_data *out; + + out =drm_hdcp_helper_initialize (connector, funcs, + attach_content_type_property); +if (IS_ERR (out)) +return out; + + out->aux = aux; + out->hdcp1_lut = &drm_hdcp_hdcp1_dpcd_lut; + +return out; +} +EXPORT_SYMBOL (drm_hdcp_helper_initialize_dp); + +/** +* drm_hdcp_helper_initialize_hdmi - Initializes the HDCP helpers for an HDMI
+ * connector
+ *
+ * @connector: pointer to the HDMI connector.
+ * @funcs: pointer to the vtable of HDCP helper funcs for this connector.
+ * @attach_content_type_property: True if thecontent_typeproperty should be
+ * attached.
+ *
+ * This function intializes the HDCP helper for the given HDMI connector. This
+ * involves creating the Content Protection property as well as the Content Type
+ * property (if desired). Upon success, it will return a pointer to the HDCP
+ * helper data. Ownership of the underlaying memory is transfered to the caller
+ * and should be freed usingdrm_hdcp_helper_destroy().
+ *
+ * Returns:
+ * Pointer to newly created HDCP helper data.PTR_ERRon failure.
+ */drivers/gpu/drm/drm_hdcp.c +24
-0+struct drm_hdcp_helper_data * +drm_hdcp_helper_initialize_hdmi (struct drm_connector *connector, +const struct drm_hdcp_helper_funcs *funcs, +bool attach_content_type_property) +{ +struct drm_hdcp_helper_data *out; + + out =drm_hdcp_helper_initialize (connector, funcs, + attach_content_type_property); +if (IS_ERR (out)) +return out; + + out->hdcp1_lut = &drm_hdcp_hdcp1_ddc_lut; + +return out; +} +EXPORT_SYMBOL (drm_hdcp_helper_initialize_hdmi); + +/** +* drm_hdcp_helper_destroy - Destroys the given HDCP helper data. +* +* @data: Pointer to the HDCP helper data. +* +* This function cleans up and destroys the HDCP helper data created by
+ *drm_hdcp_helper_initialize_dp()ordrm_hdcp_helper_initialize_hdmi().
+ */drivers/gpu/drm/drm_hdcp.c +26
-0+void drm_hdcp_helper_destroy (struct drm_hdcp_helper_data *data) +{ +struct drm_connector *connector; + +if (!data) +return ; + + connector = data->connector; + +/* +* 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->dev, + connector->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 (&data->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
drivers/gpu/drm/drm_hdcp.c +1
-0+* scheduling prop_work to ensure the connector is alive when
prop_workdrivers/gpu/drm/drm_hdcp.c +2
-0+* 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
drivers/gpu/drm/drm_hdcp.c +7
-0+* active (tl;dr This Should Never Happen). +*/ +drm_WARN_ON (connector->dev,work_pending (&data->prop_work)); + +kfree (data); +} +EXPORT_SYMBOL (drm_hdcp_helper_destroy);include/drm/drm_hdcp.h +18
-0@@ -36,6 +36,7 @@#define DRM_HDCP_DDC_BKSV 0x00#define DRM_HDCP_DDC_RI_PRIME 0x08#define DRM_HDCP_DDC_AKSV 0x10 +#define DRM_HDCP_DDC_AINFO 0x15#define DRM_HDCP_DDC_AN 0x18#define DRM_HDCP_DDC_V_PRIME (h) (0x20 + h * 4)#define DRM_HDCP_DDC_BCAPS 0x40@@ -295,6 +296,19 @@ struct drm_atomic_state;struct drm_device ;struct drm_connector ; +struct drm_hdcp_ksv { +union { +u32 words[2 ]; +u8 bytes[DRM_HDCP_KSV_LEN ]; + }; +}; +struct drm_hdcp_an { +union { +u32 words[2 ]; +u8 bytes[DRM_HDCP_AN_LEN ]; + }; +}; +int drm_hdcp_check_ksvs_revoked (struct drm_device *dev,u8 *ksvs,u32 ksv_count); int drm_connector_attach_content_protection_property(@@ -303,9 +317,186 @@ void drm_hdcp_update_content_protection(structdrm_connector *connector, u64 val);bool drm_hdcp_atomic_check (struct drm_connector *connector,struct drm_atomic_state *state); +void drm_hdcp_atomic_commit (struct drm_atomic_state *state, +struct drm_connector *connector);/* Content Type classification for HDCP2.2 vs others */ #define DRM_MODE_HDCP_CONTENT_TYPE0 0#define DRM_MODE_HDCP_CONTENT_TYPE1 1 +/** +* struct drm_hdcp_helper_funcs - A vtable of function hooks for the hdcp helper
+ *
+ * These hooks are used by the hdcp helper to call into the driver/connector
+ * code to read/write to hw.
+ */include/drm/drm_hdcp.h +18
-0+struct drm_hdcp_helper_funcs { +/** +* @setup - Performs driver-specific setup before hdcp is enabled +* +* Returns: 0 on success, -errno on failure +*/ +int (*setup)(struct drm_connector *connector, +struct drm_atomic_state *state); + +/** +* @are_keys_valid - Checks if the HDCP transmitter keys are valid +* +* Returns: true if the display controller has valid keys loaded +*/ +bool (*are_keys_valid)(struct drm_connector *connector); + +/** +* @load_keys - Instructs the driver to load its HDCP transmitter keys
include/drm/drm_hdcp.h +25
-0+* +* Returns: 0 on success, -errno on failure +*/ +int (*load_keys)(struct drm_connector *connector); + +/** +* @hdcp2_capable - Checks if both source and sink support HDCP 2.x +* +* Returns: 0 on success, -errno on failure +*/ +int (*hdcp2_capable)(struct drm_connector *connector,bool *capable); + +/** +* @hdcp2_enable - Enables HDCP 2.x on the specified connector +* +* Since we don't have multiple examples of HDCP 2.x enablement, we +* provide the bare minimum support for HDCP 2.x help. Once we have +* more examples, perhaps we can be more helpful. +* +* Returns: 0 on success, -errno on failure +*/ +int (*hdcp2_enable)(struct drm_connector *connector); + +/** +* @hdcp2_check_link - Checks the HDCP 2.x link on a specified connector
include/drm/drm_hdcp.h +16
-0+* +* Returns: 0 on success, -errno on failure +*/ +int (*hdcp2_check_link)(struct drm_connector *connector); + +/** +* @hdcp2_disable - Disables HDCP 2.x on the specified connector +* +* Returns: 0 on success, -errno on failure +*/ +int (*hdcp2_disable)(struct drm_connector *connector); + +/** +* @hdcp1_read_an_aksv - Reads transmitter's An & Aksv from hardware +* +* Use this function if hardware allows reading the transmitter's An and
include/drm/drm_hdcp.h +11
-0+* Aksv values from the kernel. If your hardware will not allow this, +* use hdcp1_send_an_aksv() and implement the transmission in the +* driver. +* +* Returns: 0 on success, -errno on failure +*/ +int (*hdcp1_read_an_aksv)(struct drm_connector *connector,u32 *an, +u32 *aksv); + +/** +* @hdcp1_send_an_aksv - Sends transmitter's An & Aksv to the receiver
include/drm/drm_hdcp.h +2
-0+* +* Only implement this on hardware where An or Aksv are not accessible
include/drm/drm_hdcp.h +9
-0+* from the kernel. If these values can be read, use +* hdcp1_read_an_aksv() instead. +* +* Returns: 0 on success, -errno on failure +*/ +int (*hdcp1_send_an_aksv)(struct drm_connector *connector); + +/** +* @hdcp1_store_receiver_info - Stores the receiver's info in the transmitter
include/drm/drm_hdcp.h +9
-0+* +* Returns: 0 on success, -errno on failure +*/ +int (*hdcp1_store_receiver_info)(struct drm_connector *connector, +u32 *ksv,u32 status,u8 caps, +bool repeater_present); + +/** +* @hdcp1_enable_encryption - Enables encryption of the outgoing signal
include/drm/drm_hdcp.h +14
-0+* +* Returns: 0 on success, -errno on failure +*/ +int (*hdcp1_enable_encryption)(struct drm_connector *connector); + +/** +* @hdcp1_wait_for_r0 - Wait for transmitter to calculate R0 +* +* Returns: 0 on success, -errno on failure +*/ +int (*hdcp1_wait_for_r0)(struct drm_connector *connector); + +/** +* @hdcp1_match_ri - Matches the given Ri from the receiver with Ri in
include/drm/drm_hdcp.h +8
-0+* the transmitter +* +* Returns: 0 on success, -errno on failure +*/ +int (*hdcp1_match_ri)(struct drm_connector *connector,u32 ri_prime); + +/** +* @hdcp1_post_encryption - Allows the driver to confirm encryption and
include/drm/drm_hdcp.h +8
-0+* perform any post-processing +* +* Returns: 0 on success, -errno on failure +*/ +int (*hdcp1_post_encryption)(struct drm_connector *connector); + +/** +* @hdcp1_store_ksv_fifo - Write the receiver's KSV list to transmitter
include/drm/drm_hdcp.h +48
-0+* +* Returns: 0 on success, -errno on failure +*/ +int (*hdcp1_store_ksv_fifo)(struct drm_connector *connector, +u8 *ksv_fifo,u8 num_downstream, +u8 *bstatus,u32 *vprime); + +/** +* @hdcp1_check_link - Allows the driver to check the HDCP 1.x status +* on a specified connector +* +* Returns: 0 on success, -errno on failure +*/ +int (*hdcp1_check_link)(struct drm_connector *connector); + +/** +* @hdcp1_disable - Disables HDCP 1.x on the specified connector +* +* Returns: 0 on success, -errno on failure +*/ +int (*hdcp1_disable)(struct drm_connector *connector); +}; + +struct drm_hdcp_helper_data ; +struct drm_dp_aux ; +struct i2c_adapter ; +struct mutex ; + +struct drm_hdcp_helper_data * +drm_hdcp_helper_initialize_dp (struct drm_connector *connector, +struct drm_dp_aux *aux, +const struct drm_hdcp_helper_funcs *funcs, +bool attach_content_type_property); + +struct drm_hdcp_helper_data * +drm_hdcp_helper_initialize_hdmi (struct drm_connector *connector, +const struct drm_hdcp_helper_funcs *funcs, +bool attach_content_type_property); + +void drm_hdcp_helper_destroy (struct drm_hdcp_helper_data *data); + +int drm_hdcp_helper_hdcp1_capable (struct drm_hdcp_helper_data *data, +bool *capable); +void drm_hdcp_helper_atomic_commit (struct drm_hdcp_helper_data *data, +struct drm_atomic_state *state, +struct mutex *driver_mutex); + +void drm_hdcp_helper_schedule_hdcp_check(struct drm_hdcp_helper_data*data);
+
#endif
Sean Paul
reviewerPATCH v3 5/14 drm/i915/hdcp: Consolidate HDCP setup/state cache
In reply to Sean PaulFrom: Sean Paul <[email protected]>
Stick all of the setup for HDCP into a dedicated function. No functional change, but this will facilitate moving HDCP logic into helpers.
Changes in v2:
-None
Changes in v3:
-None
--- drivers/gpu/drm/i915/display/intel_hdcp.c | 52 +++++++++++++++-------- 1 file changed, 35 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/display/intel_hdcp.c +35 -17
@@ -2167,6 +2167,37 @@ static enum mei_fw_tc intel_get_mei_fw_tc(enum transcoder cpu_transcoder) } } +static int +_intel_hdcp_setup (struct intel_connector *connector, +const struct intel_crtc_state *pipe_config,u8 content_type) +{ +struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); +struct intel_digital_port *dig_port =intel_attached_dig_port (connector); +struct intel_hdcp *hdcp = &connector->hdcp; +int ret =0 ; + +if (!connector->encoder) { +drm_err (&dev_priv->drm,"[%s:%d] encoder is not initialized\n" , + connector->base.name, connector->base.base.id); +return -ENODEV ; + } + + hdcp->content_type = content_type; + +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 ; + } + +if (DISPLAY_VER (dev_priv) >=12 ) + dig_port->hdcp_port_data.fw_tc =intel_get_mei_fw_tc (hdcp->cpu_transcoder); + +return ret; +} +static int initialize_hdcp_port_data (struct intel_connector *connector,struct intel_digital_port *dig_port,const struct intel_hdcp_shim *shim)
@@ -2306,28 +2337,14 @@ int intel_hdcp_enable(struct intel_connector *connector,if (!hdcp->shim)return -ENOENT ; -if (!connector->encoder) { -drm_err (&dev_priv->drm,"[%s:%d] encoder is not initialized\n" , - connector->base.name, connector->base.base.id); -return -ENODEV ; - } -mutex_lock (&hdcp->mutex);mutex_lock (&dig_port->hdcp_mutex);drm_WARN_ON (&dev_priv->drm, hdcp->value ==DRM_MODE_CONTENT_PROTECTION_ENABLED ); - hdcp->content_type = content_type; - -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 ; - } -if (DISPLAY_VER (dev_priv) >=12 ) - dig_port->hdcp_port_data.fw_tc =intel_get_mei_fw_tc (hdcp->cpu_transcoder); + ret =_intel_hdcp_setup (connector, pipe_config, content_type); +if (ret) + goto out;/* * Considering that HDCP2.2 is more secure than HDCP1.4, If the setup
@@ -2355,6 +2372,7 @@ int intel_hdcp_enable(struct intel_connector *connector, true); } +out:mutex_unlock (&dig_port->hdcp_mutex);mutex_unlock (&hdcp->mutex);return ret;
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Sean Paul
reviewerPATCH v3 6/14 drm/i915/hdcp: Retain hdcp_capable return codes
In reply to Sean PaulFrom: Sean Paul <[email protected]>
The shim functions return error codes, but they are discarded in intel_hdcp.c. This patch plumbs the return codes through so they are properly handled.
Changes in v2:
-None
Changes in v3:
-None
--- .../drm/i915/display/intel_display_debugfs.c | 9 +++- drivers/gpu/drm/i915/display/intel_hdcp.c | 51 ++++++++++--------- drivers/gpu/drm/i915/display/intel_hdcp.h | 4 +- 3 files changed, 37 insertions(+), 27 deletions(-)
drivers/gpu/drm/i915/display/intel_display_debugfs.c +7 -2
@@ -644,6 +644,7 @@ static void intel_panel_info(struct seq_file *m, struct intel_panel *panel)static void intel_hdcp_info (struct seq_file *m,struct intel_connector *intel_connector) { +int ret;bool hdcp_cap, hdcp2_cap;if (!intel_connector->hdcp.shim) {
@@ -651,8 +652,12 @@ static void intel_hdcp_info(struct seq_file *m, goto out; } - hdcp_cap =intel_hdcp_capable (intel_connector); - hdcp2_cap =intel_hdcp2_capable (intel_connector); + ret =intel_hdcp_capable (intel_connector, &hdcp_cap); +if (ret) + hdcp_cap = false; + ret =intel_hdcp2_capable (intel_connector, &hdcp2_cap); +if (ret) + hdcp2_cap = false;if (hdcp_cap)seq_puts (m,"HDCP1.4 " );
drivers/gpu/drm/i915/display/intel_hdcp.c +28 -23
112 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_hdcp.h +2 -2
@@ -33,8 +33,8 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state);bool is_hdcp_supported (struct drm_i915_private *dev_priv,enum port port); -bool intel_hdcp_capable (struct intel_connector *connector); -bool intel_hdcp2_capable (struct intel_connector *connector); +int intel_hdcp_capable (struct intel_connector *connector,bool *capable); +int intel_hdcp2_capable (struct intel_connector *connector,bool *capable);void intel_hdcp_component_init (struct drm_i915_private *dev_priv);void intel_hdcp_component_fini (struct drm_i915_private *dev_priv);void intel_hdcp_cleanup (struct intel_connector *connector);
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Sean Paul
reviewerPATCH v3 7/14 drm/i915/hdcp: Use HDCP helpers for i915
In reply to Sean PaulFrom: Sean Paul <[email protected]>
Now that all of the HDCP 1.x logic has been migrated to the central HDCP helpers, use it in the i915 driver.
The majority of the driver code for HDCP 1.x will live in intel_hdcp.c, however there are a few helper hooks which are connector-specific and need to be partially or fully implemented in the intel_dp_hdcp.c or intel_hdmi.c.
We'll leave most of the HDCP 2.x code alone since we don't have another implementation of HDCP 2.x to use as reference for what should and should not live in the drm helpers. The helper will call the overly general enable/disable/is_capable HDCP 2.x callbacks and leave the interesting stuff for the driver. Once we have another HDCP 2.x implementation, we should do a similar migration.
Changes in v2:
-Fix mst helper function pointer reported by 0-day
Changes in v3:
-Add forward declaration for drm_atomic_state in intel_hdcp.h identified
by 0-day
--- drivers/gpu/drm/i915/display/intel_ddi.c | 29 +- .../drm/i915/display/intel_display_debugfs.c | 6 +- .../drm/i915/display/intel_display_types.h | 58 +- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 345 +++---- drivers/gpu/drm/i915/display/intel_dp_mst.c | 17 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 935 +++--------------- drivers/gpu/drm/i915/display/intel_hdcp.h | 31 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 256 ++--- 8 files changed, 418 insertions(+), 1259 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +21 -8
@@ -26,6 +26,7 @@*/ #include <drm/drm_scdc_helper.h> +#include <drm/drm_hdcp.h> #include "i915_drv.h" #include "intel_audio.h"
@@ -3143,6 +3144,9 @@ static void intel_enable_ddi(struct intel_atomic_state *state,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_digital_port *dig_port =enc_to_dig_port (encoder); +drm_WARN_ON (state->base.dev, crtc_state->has_pch_encoder);if (!crtc_state->bigjoiner_slave)
@@ -3159,12 +3163,10 @@ static void intel_enable_ddi(struct intel_atomic_state *state,else intel_enable_ddi_dp (state, encoder, crtc_state, conn_state); -/* Enable hdcp if it's desired */ -if (conn_state->content_protection == -DRM_MODE_CONTENT_PROTECTION_DESIRED ) -intel_hdcp_enable (to_intel_connector (conn_state->connector), - crtc_state, - (u8 )conn_state->hdcp_content_type); +if (connector->hdcp_helper_data) +drm_hdcp_helper_atomic_commit (connector->hdcp_helper_data, + &state->base, + &dig_port->hdcp_mutex); } static void intel_disable_ddi_dp(struct intel_atomic_state *state,
@@ -3224,7 +3226,13 @@ static void intel_disable_ddi(struct intel_atomic_state *state,const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state *old_conn_state) { - intel_hdcp_disable(to_intel_connector(old_conn_state->connector)); + struct intel_connector *connector = to_intel_connector(old_conn_state->connector); +struct intel_digital_port *dig_port =enc_to_dig_port (encoder); + +if (connector->hdcp_helper_data) +drm_hdcp_helper_atomic_commit (connector->hdcp_helper_data, + &state->base, + &dig_port->hdcp_mutex); if (intel_crtc_has_type(old_crtc_state, INTEL_OUTPUT_HDMI)) intel_disable_ddi_hdmi(state, encoder, old_crtc_state,
@@ -3254,13 +3262,18 @@ void intel_ddi_update_pipe(struct intel_atomic_state *state,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_digital_port *dig_port =enc_to_dig_port (encoder);if (!intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI ) && !intel_encoder_is_mst (encoder))intel_ddi_update_pipe_dp (state, encoder, crtc_state, conn_state); -intel_hdcp_update_pipe (state ,encoder ,crtc_state ,conn_state ); +if (connector->hdcp_helper_data) +drm_hdcp_helper_atomic_commit (connector->hdcp_helper_data, + &state->base, + &dig_port->hdcp_mutex); } static void
drivers/gpu/drm/i915/display/intel_display_debugfs.c +4 -2
@@ -5,6 +5,7 @@#include <drm/drm_debugfs.h> #include <drm/drm_fourcc.h> +#include <drm/drm_hdcp.h> #include "i915_debugfs.h" #include "intel_display_debugfs.h"
@@ -652,10 +653,11 @@ static void intel_hdcp_info(struct seq_file *m, goto out; } - ret =intel_hdcp_capable (intel_connector, &hdcp_cap); + ret =drm_hdcp_helper_hdcp1_capable (intel_connector->hdcp_helper_data, + &hdcp_cap);if (ret) hdcp_cap = false; - ret =intel_hdcp2_capable (intel_connector, &hdcp2_cap); + ret =intel_hdcp2_capable (&intel_connector->base, &hdcp2_cap);if (ret) hdcp2_cap = false;
drivers/gpu/drm/i915/display/intel_display_types.h +1 -57
77 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_dp_hdcp.c +119 -226
426 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_dp_mst.c +10 -7
@@ -40,7 +40,6 @@#include "intel_dp_hdcp.h" #include "intel_dp_mst.h" #include "intel_dpio_phy.h" -#include "intel_hdcp.h" #include "intel_hotplug.h" #include "skl_scaler.h"
@@ -374,7 +373,10 @@ static void intel_mst_disable_dp(struct intel_atomic_state *state,drm_dbg_kms (&i915->drm,"active links %d\n" , intel_dp->active_mst_links); -intel_hdcp_disable (intel_mst->connector); +if (connector->hdcp_helper_data) +drm_hdcp_helper_atomic_commit (connector->hdcp_helper_data, + &state->base, + &dig_port->hdcp_mutex);drm_dp_mst_reset_vcpi_slots (&intel_dp->mst_mgr, connector->port);
@@ -544,6 +546,8 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state,struct intel_digital_port *dig_port = intel_mst->primary;struct intel_dp *intel_dp = &dig_port->dp;struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_connector *connector = +to_intel_connector (conn_state->connector);enum transcoder trans = pipe_config->cpu_transcoder;drm_WARN_ON (&dev_priv->drm, pipe_config->has_pch_encoder);
@@ -585,11 +589,10 @@ static void intel_mst_enable_dp(struct intel_atomic_state *state,intel_audio_codec_enable (encoder, pipe_config, conn_state);/* Enable hdcp if it's desired */ -if (conn_state->content_protection == -DRM_MODE_CONTENT_PROTECTION_DESIRED ) -intel_hdcp_enable (to_intel_connector (conn_state->connector), - pipe_config, - (u8 )conn_state->hdcp_content_type); +if (connector->hdcp_helper_data) +drm_hdcp_helper_atomic_commit (connector->hdcp_helper_data, + &state->base, + &dig_port->hdcp_mutex); } static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder,
drivers/gpu/drm/i915/display/intel_hdcp.c +152 -783
1,164 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_hdcp.h +23 -8
@@ -10,8 +10,10 @@#define HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS 50 +struct drm_atomic_state ;struct drm_connector ;struct drm_connector_state ; +struct drm_hdcp_an ;struct drm_i915_private ;struct intel_atomic_state ;struct intel_connector ;
@@ -25,16 +27,29 @@ enum transcoder;int intel_hdcp_init (struct intel_connector *connector,struct intel_digital_port *dig_port,const struct intel_hdcp_shim *hdcp_shim); -int intel_hdcp_enable (struct intel_connector *connector, -const struct intel_crtc_state *pipe_config,u8 content_type); -int intel_hdcp_disable (struct intel_connector *connector); -void intel_hdcp_update_pipe (struct intel_atomic_state *state, -struct intel_encoder *encoder, -const struct intel_crtc_state *crtc_state, -const struct drm_connector_state *conn_state); +int intel_hdcp_setup (struct drm_connector *drm_connector, +struct drm_atomic_state *state); +int intel_hdcp_load_keys (struct drm_connector *drm_connector);bool is_hdcp_supported (struct drm_i915_private *dev_priv,enum port port);int intel_hdcp_capable (struct intel_connector *connector,bool *capable); -int intel_hdcp2_capable (struct intel_connector *connector,bool *capable); +int intel_hdcp2_capable (struct drm_connector *drm_connector,bool *capable); +int intel_hdcp2_enable (struct drm_connector *drm_connector); +int intel_hdcp2_disable (struct drm_connector *drm_connector); +int intel_hdcp2_check_link (struct drm_connector *drm_connector); +int intel_hdcp1_store_receiver_info (struct drm_connector *drm_connector, +u32 *ksv,u32 status,u8 caps, +bool repeater_present); +int intel_hdcp1_read_an (struct drm_connector *drm_connector, +struct drm_hdcp_an *an); +int intel_hdcp1_enable_encryption (struct drm_connector *drm_connector); +int intel_hdcp1_wait_for_r0 (struct drm_connector *drm_connector); +int intel_hdcp1_match_ri (struct drm_connector *drm_connector,u32 ri_prime); +int intel_hdcp1_post_encryption (struct drm_connector *drm_connector); +int intel_hdcp1_store_ksv_fifo (struct drm_connector *drm_connector, +u8 *ksv_fifo,u8 num_downstream,u8 *bstatus, +u32 *v_prime); +int intel_hdcp1_check_link (struct drm_connector *drm_connector); +int intel_hdcp1_disable (struct drm_connector *drm_connector);void intel_hdcp_component_init (struct drm_i915_private *dev_priv);void intel_hdcp_component_fini (struct drm_i915_private *dev_priv);void intel_hdcp_cleanup (struct intel_connector *connector);
drivers/gpu/drm/i915/display/intel_hdmi.c +88 -168
334 lines not on this page · raw message
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Sean Paul
reviewerPATCH v3 8/14 drm/msm/dpu_kms: Re-order dpu includes
In reply to Sean PaulFrom: Sean Paul <[email protected]>
Make includes alphabetical in dpu_kms.c
Changes in v2:
-None
Changes in v3:
-None
--- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +4 -4
@@ -21,14 +21,14 @@#include "msm_gem.h" #include "disp/msm_disp_snapshot.h" -#include "dpu_kms.h" #include "dpu_core_irq.h" +#include "dpu_crtc.h" +#include "dpu_encoder.h" #include "dpu_formats.h" #include "dpu_hw_vbif.h" -#include "dpu_vbif.h" -#include "dpu_encoder.h" +#include "dpu_kms.h" #include "dpu_plane.h" -#include "dpu_crtc.h" +#include "dpu_vbif.h" #define CREATE_TRACE_POINTS #include "dpu_trace.h"
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Re: [PATCH v3 08/14] drm/msm/dpu_kms: Re-order dpu includes
Quoted 10 lines · Sean Paul
From: Sean Paul <[email protected]>
Make includes alphabetical in
dpu_kms.cReviewed-by Abhinav Kumar <[email protected]>Reviewed-by Stephen Boyd <[email protected]>Signed-off-by Sean Paul <[email protected]>
Quoted 4 lines
Changes in v2:
-None
Changes in v3:
-None
Quoted 28 lines
--- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +4
-4@@ -21,14 +21,14 @@#include "msm_gem.h" #include "disp/msm_disp_snapshot.h" -#include "dpu_kms.h" #include "dpu_core_irq.h" +#include "dpu_crtc.h" +#include "dpu_encoder.h" #include "dpu_formats.h" #include "dpu_hw_vbif.h" -#include "dpu_vbif.h" -#include "dpu_encoder.h" +#include "dpu_kms.h" #include "dpu_plane.h" -#include "dpu_crtc.h" +#include "dpu_vbif.h" #define CREATE_TRACE_POINTS #include "dpu_trace.h"
Signature · 2 lines
With best wishes Dmitry
Sean Paul
reviewerPATCH v3 9/14 drm/msm/dpu: Remove useless checks in dpu_encoder
In reply to Sean PaulFrom: Sean Paul <[email protected]>
A couple more useless checks to remove in dpu_encoder.
Changes in v2:
-None
Changes in v3:
-None
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 12 ------------ 1 file changed, 12 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +0 -12
@@ -1153,10 +1153,6 @@ static void dpu_encoder_virt_enable(struct drm_encoder *drm_enc)struct msm_drm_private *priv;struct drm_display_mode *cur_mode =NULL ; -if (!drm_enc) { -DPU_ERROR ("invalid encoder\n" ); -return ; - } dpu_enc =to_dpu_encoder_virt (drm_enc);mutex_lock (&dpu_enc->enc_lock);
@@ -1203,14 +1199,6 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc)struct msm_drm_private *priv;int i =0 ; -if (!drm_enc) { -DPU_ERROR ("invalid encoder\n" ); -return ; - }else if (!drm_enc->dev) { -DPU_ERROR ("invalid dev\n" ); -return ; - } - dpu_enc =to_dpu_encoder_virt (drm_enc);DPU_DEBUG_ENC (dpu_enc,"\n" );
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Re: [PATCH v3 09/14] drm/msm/dpu: Remove useless checks in dpu_encoder
Quoted 8 lines · Sean Paul
From: Sean Paul <[email protected]>
A couple more useless checks to remove in
dpu_encoder.
Quoted 40 lines
Changes in v2:
-None
Changes in v3:(quoted diff) +0
-2-None --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 12 ------------ 1 file changed, 12 deletions(-)drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +0
-12@@ -1153,10 +1153,6 @@ static void dpu_encoder_virt_enable(struct drm_encoder *drm_enc)struct msm_drm_private *priv;struct drm_display_mode *cur_mode =NULL ; -if (!drm_enc) { -DPU_ERROR ("invalid encoder\n" ); -return ; - } dpu_enc =to_dpu_encoder_virt (drm_enc);mutex_lock (&dpu_enc->enc_lock);@@ -1203,14 +1199,6 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc)struct msm_drm_private *priv;int i =0 ; -if (!drm_enc) { -DPU_ERROR ("invalid encoder\n" ); -return ; - }else if (!drm_enc->dev) { -DPU_ERROR ("invalid dev\n" ); -return ; - } - dpu_enc =to_dpu_encoder_virt (drm_enc);DPU_DEBUG_ENC (dpu_enc,"\n" );
Signature · 2 lines
With best wishes Dmitry
Re: [Freedreno] [PATCH v3 09/14] drm/msm/dpu: Remove useless checks in dpu_encoder
In reply to Sean PaulQuoted 6 lines · Sean Paul
From: Sean Paul <[email protected]>
A couple more useless checks to remove in
dpu_encoder.Reviewed-by Stephen Boyd <[email protected]>Signed-off-by Sean Paul <[email protected]>
Quoted 47 lines
Link:
https://patchwork.freedesktop.org/patch/msgid/[email protected]
#v1
Link:
https://patchwork.freedesktop.org/patch/msgid/[email protected]
#v2Changes in v2:
-None
Changes in v3:(quoted diff) +0
-2-None --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 12 ------------ 1 file changed, 12 deletions(-)drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +0
-4@@ -1153,10 +1153,6 @@ static void dpu_encoder_virt_enable(struct drm_encoder *drm_enc)struct msm_drm_private *priv;struct drm_display_mode *cur_mode =NULL ; -if (!drm_enc) { -DPU_ERROR ("invalid encoder\n" ); -return ; - } dpu_enc =to_dpu_encoder_virt (drm_enc);drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +0
-8mutex_lock (&dpu_enc->enc_lock);@@ -1203,14 +1199,6 @@ static void dpu_encoder_virt_disable(struct drm_encoder *drm_enc)struct msm_drm_private *priv;int i =0 ; -if (!drm_enc) { -DPU_ERROR ("invalid encoder\n" ); -return ; - }else if (!drm_enc->dev) { -DPU_ERROR ("invalid dev\n" ); -return ; - } - dpu_enc =to_dpu_encoder_virt (drm_enc);DPU_DEBUG_ENC (dpu_enc,"\n" );
Sean Paul
reviewerPATCH v3 10/14 drm/msm/dpu: Remove encoder->enable() hack
In reply to Sean PaulFrom: Sean Paul <[email protected]>
encoder->commit() was being misused because there were some global resources which needed to be tweaked in encoder->enable() which were not accessible in dpu_encoder.c. That is no longer true and the redirect serves no purpose any longer. So remove the indirection.
Changes in v2:
-None
Changes in v3:
-None
--- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 5 +---- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 22 --------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 4 ---- 4 files changed, 1 insertion(+), 32 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +1 -4
@@ -2122,11 +2122,8 @@ static void dpu_encoder_frame_done_timeout(struct timer_list *t)static const struct drm_encoder_helper_funcs dpu_encoder_helper_funcs = { .mode_set = dpu_encoder_virt_mode_set, .disable = dpu_encoder_virt_disable, - .enable = dpu_kms_encoder_enable, + .enable = dpu_encoder_virt_enable, .atomic_check = dpu_encoder_virt_atomic_check, - -/* This is called by dpu_kms_encoder_enable */ - .commit = dpu_encoder_virt_enable, };static const struct drm_encoder_funcs dpu_encoder_funcs = {
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -22
@@ -381,28 +381,6 @@ static void dpu_kms_flush_commit(struct msm_kms *kms, unsigned crtc_mask) } } -/* -* Override the encoder enable since we need to setup the inline rotator and do -* some crtc magic before enabling any bridge that might be present. -*/ -void dpu_kms_encoder_enable (struct drm_encoder *encoder) -{ -const struct drm_encoder_helper_funcs *funcs = encoder->helper_private; -struct drm_device *dev = encoder->dev; -struct drm_crtc *crtc; - -/* Forward this enable call to the commit hook */ -if (funcs && funcs->commit) - funcs->commit (encoder); - -drm_for_each_crtc (crtc, dev) { -if (!(crtc->state->encoder_mask &drm_encoder_mask (encoder))) -continue ; - -trace_dpu_kms_enc_enable (DRMID (crtc)); - } -} -static void dpu_kms_complete_commit (struct msm_kms *kms,unsigned crtc_mask) {struct dpu_kms *dpu_kms =to_dpu_kms (kms);
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +0 -2
@@ -248,8 +248,6 @@ void *dpu_debugfs_get_root(struct dpu_kms *dpu_kms);int dpu_enable_vblank (struct msm_kms *kms,struct drm_crtc *crtc);void dpu_disable_vblank (struct msm_kms *kms,struct drm_crtc *crtc); -void dpu_kms_encoder_enable (struct drm_encoder *encoder); -/** * dpu_kms_get_clk_rate() - get the clock rate * @dpu_kms: pointer to dpu_kms structure
drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +0 -4
@@ -266,10 +266,6 @@ DEFINE_EVENT(dpu_drm_obj_template, dpu_crtc_complete_commit, TP_PROTO(uint32_t drm_id), TP_ARGS(drm_id) ); -DEFINE_EVENT (dpu_drm_obj_template, dpu_kms_enc_enable, - TP_PROTO(uint32_t drm_id), -TP_ARGS (drm_id) -);DEFINE_EVENT (dpu_drm_obj_template, dpu_kms_commit, TP_PROTO(uint32_t drm_id), TP_ARGS(drm_id)
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Re: [PATCH v3 10/14] drm/msm/dpu: Remove encoder->enable() hack
Quoted 7 lines · Sean Paul
From: Sean Paul <[email protected]>
encoder->commit()was being misused because there were some global resources which needed to be tweaked inencoder->enable()which were not accessible indpu_encoder.c. That is no longer true and the redirect serves no purpose any longer. So remove the indirection.
Quoted 5 lines
Quoted 91 lines
Changes in v2:
-None
Changes in v3:(quoted diff) +0
-2-None --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 5 +---- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 22 --------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 4 ---- 4 files changed, 1 insertion(+), 32 deletions(-)drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +1
-4@@ -2122,11 +2122,8 @@ static void dpu_encoder_frame_done_timeout(struct timer_list *t)static const struct drm_encoder_helper_funcs dpu_encoder_helper_funcs = { .mode_set = dpu_encoder_virt_mode_set, .disable = dpu_encoder_virt_disable, - .enable = dpu_kms_encoder_enable, + .enable = dpu_encoder_virt_enable, .atomic_check = dpu_encoder_virt_atomic_check, - -/* This is called by dpu_kms_encoder_enable */ - .commit = dpu_encoder_virt_enable, };static const struct drm_encoder_funcs dpu_encoder_funcs = {drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0
-22@@ -381,28 +381,6 @@ static void dpu_kms_flush_commit(struct msm_kms *kms, unsigned crtc_mask) } } -/* -* Override the encoder enable since we need to setup the inline rotator and do -* some crtc magic before enabling any bridge that might be present. -*/ -void dpu_kms_encoder_enable (struct drm_encoder *encoder) -{ -const struct drm_encoder_helper_funcs *funcs = encoder->helper_private; -struct drm_device *dev = encoder->dev; -struct drm_crtc *crtc; - -/* Forward this enable call to the commit hook */ -if (funcs && funcs->commit) - funcs->commit (encoder); - -drm_for_each_crtc (crtc, dev) { -if (!(crtc->state->encoder_mask &drm_encoder_mask (encoder))) -continue ; - -trace_dpu_kms_enc_enable (DRMID (crtc)); - } -} -static void dpu_kms_complete_commit (struct msm_kms *kms,unsigned crtc_mask) {struct dpu_kms *dpu_kms =to_dpu_kms (kms);drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +0
-2@@ -248,8 +248,6 @@ void *dpu_debugfs_get_root(struct dpu_kms *dpu_kms);int dpu_enable_vblank (struct msm_kms *kms,struct drm_crtc *crtc);void dpu_disable_vblank (struct msm_kms *kms,struct drm_crtc *crtc); -void dpu_kms_encoder_enable (struct drm_encoder *encoder); -/** * dpu_kms_get_clk_rate() - get the clock rate * @dpu_kms: pointer to dpu_kms structure drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +0
-4@@ -266,10 +266,6 @@ DEFINE_EVENT(dpu_drm_obj_template, dpu_crtc_complete_commit, TP_PROTO(uint32_t drm_id), TP_ARGS(drm_id) ); -DEFINE_EVENT (dpu_drm_obj_template, dpu_kms_enc_enable, - TP_PROTO(uint32_t drm_id), -TP_ARGS (drm_id) -);DEFINE_EVENT (dpu_drm_obj_template, dpu_kms_commit, TP_PROTO(uint32_t drm_id), TP_ARGS(drm_id)
Signature · 2 lines
With best wishes Dmitry
Re: [PATCH v3 10/14] drm/msm/dpu: Remove encoder->enable() hack
In reply to Sean PaulQuoted 10 lines · Sean Paul
From: Sean Paul <[email protected]>
encoder->commit()was being misused because there were some global resources which needed to be tweaked inencoder->enable()which were not accessible indpu_encoder.c. That is no longer true and the redirect serves no purpose any longer. So remove the indirection.Reviewed-by Stephen Boyd <[email protected]>Tested-by Stephen Boyd <[email protected]>Signed-off-by Sean Paul <[email protected]>
Quoted 108 lines
Link:
https://patchwork.freedesktop.org/patch/msgid/[email protected]
#v1
Link:
https://patchwork.freedesktop.org/patch/msgid/[email protected]
#v2Changes in v2:
-None
Changes in v3:(quoted diff) +0
-2-None --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 5 +---- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 22 --------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 4 ---- 4 files changed, 1 insertion(+), 32 deletions(-)drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +1
-4@@ -2122,11 +2122,8 @@ static void dpu_encoder_frame_done_timeout(struct timer_list *t) static const struct drm_encoder_helper_funcs dpu_encoder_helper_funcs = { .mode_set = dpu_encoder_virt_mode_set, .disable = dpu_encoder_virt_disable, - .enable = dpu_kms_encoder_enable, + .enable = dpu_encoder_virt_enable, .atomic_check = dpu_encoder_virt_atomic_check, - -/* This is called by dpu_kms_encoder_enable */ - .commit = dpu_encoder_virt_enable, };static const struct
drm_encoder_funcsdpu_encoder_funcs= {drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0
-2@@ -381,28 +381,6 @@ static void dpu_kms_flush_commit(struct msm_kms *kms, unsigned crtc_mask) } } -/* -* Override the encoder enable since we need to setup the inline rotator and do
- * some crtc magic before enabling any bridge that might be present.
- */drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0
-3-void dpu_kms_encoder_enable (struct drm_encoder *encoder) -{ - const struct drm_encoder_helper_funcs *funcs =
encoder->helper_private;drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0
-15-struct drm_device *dev = encoder->dev; -struct drm_crtc *crtc; - -/* Forward this enable call to the commit hook */ -if (funcs && funcs->commit) - funcs->commit (encoder); - -drm_for_each_crtc (crtc, dev) { -if (!(crtc->state->encoder_mask &drm_encoder_mask (encoder))) -continue ; - -trace_dpu_kms_enc_enable (DRMID (crtc)); - } -} - static void dpu_kms_complete_commit(struct msm_kms *kms, unsigned
crtc_mask)
{drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0
-0struct dpu_kms *dpu_kms =to_dpu_kms (kms);drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +0
-2@@ -248,8 +248,6 @@ void *dpu_debugfs_get_root(struct dpu_kms *dpu_kms);int dpu_enable_vblank (struct msm_kms *kms,struct drm_crtc *crtc);void dpu_disable_vblank (struct msm_kms *kms,struct drm_crtc *crtc); -void dpu_kms_encoder_enable (struct drm_encoder *encoder); -/** * dpu_kms_get_clk_rate() - get the clock rate * @dpu_kms: pointer to
dpu_kmsstructuredrivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +0
-4@@ -266,10 +266,6 @@ DEFINE_EVENT(dpu_drm_obj_template, dpu_crtc_complete_commit, TP_PROTO(uint32_t drm_id),TP_ARGS (drm_id) ); -DEFINE_EVENT (dpu_drm_obj_template, dpu_kms_enc_enable, - TP_PROTO(uint32_t drm_id), -TP_ARGS (drm_id) -); DEFINE_EVENT(dpu_drm_obj_template, dpu_kms_commit, TP_PROTO(uint32_t drm_id),
TP_ARGS(drm_id)
Sean Paul
reviewerPATCH v3 11/14 drm/msm/dp: Re-order dp_audio_put in deinit_sub_modules
In reply to Sean PaulFrom: Sean Paul <[email protected]>
Audio is initialized last, it should be de-initialized first to match the order in dp_init_sub_modules().
Changes in v2:
-None
--- drivers/gpu/drm/msm/dp/dp_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/dp/dp_display.c +1 -1
@@ -714,9 +714,9 @@ static int dp_irq_hpd_handle(struct dp_display_private *dp, u32 data)static void dp_display_deinit_sub_modules (struct dp_display_private *dp) {dp_debug_put (dp->debug); +dp_audio_put (dp->audio);dp_panel_put (dp->panel);dp_aux_put (dp->aux); -dp_audio_put (dp->audio); }static int dp_init_sub_modules (struct dp_display_private *dp)
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Re: [PATCH v3 11/14] drm/msm/dp: Re-order dp_audio_put in deinit_sub_modules
Quoted 10 lines · Sean Paul
From: Sean Paul <[email protected]>
Audio is initialized last, it should be de-initialized first to match the order in
dp_init_sub_modules().Reviewed-by Abhinav Kumar <[email protected]>Reviewed-by Stephen Boyd <[email protected]>Signed-off-by Sean Paul <[email protected]>
Quoted 23 lines
Changes in v2:
(quoted diff) +0
-2-None --- drivers/gpu/drm/msm/dp/dp_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/msm/dp/dp_display.c +1
-1@@ -714,9 +714,9 @@ static int dp_irq_hpd_handle(struct dp_display_private *dp, u32 data)static void dp_display_deinit_sub_modules (struct dp_display_private *dp) {dp_debug_put (dp->debug); +dp_audio_put (dp->audio);dp_panel_put (dp->panel);dp_aux_put (dp->aux); -dp_audio_put (dp->audio); }static int dp_init_sub_modules (struct dp_display_private *dp)
Signature · 2 lines
With best wishes Dmitry
Sean Paul
reviewerPATCH v3 12/14 dt-bindings: msm/dp: Add bindings for HDCP registers
In reply to Sean PaulFrom: Sean Paul <[email protected]>
This patch adds the bindings for the MSM DisplayPort HDCP registers which are required to write the HDCP key into the display controller as well as the registers to enable HDCP authentication/key exchange/encryption.
We'll use a new compatible string for this since the fields are optional.
Changes in v2:
-Drop register range names (Stephen)
-Fix yaml errors (Rob)
Changes in v3:
-Add new compatible string for dp-hdcp -Add descriptions to reg
-Add minItems/maxItems to reg
-Make reg depend on the new hdcp compatible string
---
Disclaimer: I really don't know if this is the right way to approach this. I tried using examples from other bindings, but feedback would be very much welcome on how I could add the optional register ranges.
.../bindings/display/msm/dp-controller.yaml | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/display/msm/dp-controller.yaml +30 -4
@@ -17,9 +17,10 @@ properties: compatible: enum: - qcom,sc7180-dp + - qcom,sc7180-dp-hdcp - reg: - maxItems: 1 + # See compatible-specific constraints below. + reg: true interrupts: maxItems: 1
@@ -89,6 +90,29 @@ required: - power-domains - ports +allOf: + - if: + properties: + compatible: + contains: + const: qcom,sc7180-dp-hdcp + then: + properties: + reg: + minItems: 3 + maxItems: 3 + items: + - description: Registers for base DP functionality + - description: (Optional) Registers for HDCP device key injection + - description: (Optional) Registers for HDCP TrustZone interaction + else: + properties: + reg: + minItems: 1 + maxItems: 1 + items: + - description: Registers for base DP functionality + additionalProperties: false examples:
@@ -99,8 +123,10 @@ examples: #include <dt-bindings/power/qcom-rpmpd.h> displayport-controller@ae90000 { - compatible = "qcom,sc7180-dp"; - reg = <0xae90000 0x1400>; + compatible = "qcom,sc7180-dp-hdcp"; + reg = <0 0x0ae90000 0 0x1400>, + <0 0x0aed1000 0 0x174>, + <0 0x0aee1000 0 0x2c>; interrupt-parent = <&mdss>; interrupts = <12>; clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Rob Herring
maintainerRe: [PATCH v3 12/14] dt-bindings: msm/dp: Add bindings for HDCP registers
Quoted 25 lines · Sean Paul
From: Sean Paul <[email protected]>
This patch adds the bindings for the MSM DisplayPort HDCP registers which are required to write the HDCP key into the display controller as well as the registers to enable HDCP authentication/key exchange/encryption.
We'll use a new compatible string for this since the fields are optional.
Cc Rob Herring <[email protected]>Cc Stephen Boyd <[email protected]>Signed-off-by Sean Paul <[email protected]>Changes in v2:
(quoted diff) +0
-2-Drop register range names (Stephen) -Fix yaml errors (Rob)Changes in v3:
(quoted diff) +0
-5-Add new compatible string for dp-hdcp -Add descriptions to reg -Add minItems/maxItems to reg -Make reg depend on the new hdcp compatible string ---
Quoted 8 lines
Disclaimer: I really don't know if this is the right way to approach this. I tried using examples from other bindings, but feedback would be very much welcome on how I could add the optional register ranges.
.../bindings/display/msm/dp-controller.yaml | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-)
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check' on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors:
dtschema/dtc warnings/errors:
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/display/msm/dp-controller.example.dt.yaml: example-0: displayport-controller@ae90000:reg:0: [0, 183042048, 0, 5120] is too long
From schema: /usr/local/lib/python3.8/dist-packages/dtschema/schemas/reg.yaml
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/display/msm/dp-controller.example.dt.yaml: example-0: displayport-controller@ae90000:reg:1: [0, 183308288, 0, 372] is too long
From schema: /usr/local/lib/python3.8/dist-packages/dtschema/schemas/reg.yaml
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/display/msm/dp-controller.example.dt.yaml: example-0: displayport-controller@ae90000:reg:2: [0, 183373824, 0, 44] is too long
From schema: /usr/local/lib/python3.8/dist-packages/dtschema/schemas/reg.yaml
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/patch/1535361
This check can fail if there are any dependencies. The base for a patch series is generally the most recent rc1.
If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:
pip3 install dtschema --upgrade
Please check and re-submit.
Re: [PATCH v3 12/14] dt-bindings: msm/dp: Add bindings for HDCP registers
In reply to Sean PaulQuoted 9 lines · Sean Paul
From: Sean Paul <[email protected]>
This patch adds the bindings for the MSM DisplayPort HDCP registers which are required to write the HDCP key into the display controller as well as the registers to enable HDCP authentication/key exchange/encryption.
We'll use a new compatible string for this since the fields are optional.
I don't think you need a new compatible, in particular since I presume we should use the hdcp compatible in all platforms? Or is there a reason for not picking that one?
Instead I suggest that you simply do minItems: 1, maxItems: 3 and detect which of the two cases you have in the driver.
PS. I hope to get
https://lore.kernel.org/linux-arm-msm/[email protected]/
landed before we add these new optional regions...
Regards,
Bjorn
Quoted 87 lines
Cc Rob Herring <[email protected]>Cc Stephen Boyd <[email protected]>Signed-off-by Sean Paul <[email protected]>Changes in v2:
(quoted diff) +0
-2-Drop register range names (Stephen) -Fix yaml errors (Rob)Changes in v3:
(quoted diff) +0
-5-Add new compatible string for dp-hdcp -Add descriptions to reg -Add minItems/maxItems to reg -Make reg depend on the new hdcp compatible string ---Disclaimer: I really don't know if this is the right way to approach this. I tried using examples from other bindings, but feedback would be very much welcome on how I could add the optional register ranges.
.../bindings/display/msm/dp-controller.yaml | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-)Documentation/devicetree/bindings/display/msm/dp-controller.yaml +30
-4@@ -17,9 +17,10 @@ properties: compatible: enum: - qcom,sc7180-dp + - qcom,sc7180-dp-hdcp - reg: - maxItems: 1 + # See compatible-specific constraints below. + reg: true interrupts: maxItems: 1@@ -89,6 +90,29 @@ required: - power-domains - ports +allOf: + - if: + properties: + compatible: + contains: + const: qcom,sc7180-dp-hdcp + then: + properties: + reg: + minItems: 3 + maxItems: 3 + items: + - description: Registers for base DP functionality + - description: (Optional) Registers for HDCP device key injection + - description: (Optional) Registers for HDCP TrustZone interaction + else: + properties: + reg: + minItems: 1 + maxItems: 1 + items: + - description: Registers for base DP functionality + additionalProperties: false examples:@@ -99,8 +123,10 @@ examples: #include <dt-bindings/power/qcom-rpmpd.h> displayport-controller@ae90000 { - compatible = "qcom,sc7180-dp"; - reg = <0xae90000 0x1400>; + compatible = "qcom,sc7180-dp-hdcp"; + reg = <0 0x0ae90000 0 0x1400>, + <0 0x0aed1000 0 0x174>, + <0 0x0aee1000 0 0x2c>; interrupt-parent = <&mdss>; interrupts = <12>; clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Sean Paul
reviewerRe: [PATCH v3 12/14] dt-bindings: msm/dp: Add bindings for HDCP registers
Quoted 12 lines · Bjorn Andersson
Quoted 9 lines · Sean Paul
From: Sean Paul <[email protected]>
This patch adds the bindings for the MSM DisplayPort HDCP registers which are required to write the HDCP key into the display controller as well as the registers to enable HDCP authentication/key exchange/encryption.
We'll use a new compatible string for this since the fields are optional.
Quoted 6 lines
I don't think you need a new compatible, in particular since I presume we should use the hdcp compatible in all platforms? Or is there a reason for not picking that one?
Instead I suggest that you simply do minItems: 1, maxItems: 3 and detect which of the two cases you have in the driver.
Thanks for your review, Bjorn! I had done this in v2 (see [1] & [2]), but it was suggested that a new compatible would be better. I'll change it back to this method rebased on top of your changes.
Sean
[1]- https://patchwork.freedesktop.org/patch/454066/?series=94712&rev=1
[2]- https://patchwork.freedesktop.org/patch/454068/?series=94712&rev=1
Quoted 95 lines
PS. I hope to get
https://lore.kernel.org/linux-arm-msm/[email protected]/
landed before we add these new optional regions...Regards,
BjornQuoted 87 lines
Cc Rob Herring <[email protected]>Cc Stephen Boyd <[email protected]>Signed-off-by Sean Paul <[email protected]>Changes in v2:
(quoted diff) +0
-2-Drop register range names (Stephen) -Fix yaml errors (Rob)Changes in v3:
(quoted diff) +0
-5-Add new compatible string for dp-hdcp -Add descriptions to reg -Add minItems/maxItems to reg -Make reg depend on the new hdcp compatible string ---Disclaimer: I really don't know if this is the right way to approach this. I tried using examples from other bindings, but feedback would be very much welcome on how I could add the optional register ranges.
.../bindings/display/msm/dp-controller.yaml | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-)Documentation/devicetree/bindings/display/msm/dp-controller.yaml +30
-4@@ -17,9 +17,10 @@ properties: compatible: enum: - qcom,sc7180-dp + - qcom,sc7180-dp-hdcp - reg: - maxItems: 1 + # See compatible-specific constraints below. + reg: true interrupts: maxItems: 1@@ -89,6 +90,29 @@ required: - power-domains - ports +allOf: + - if: + properties: + compatible: + contains: + const: qcom,sc7180-dp-hdcp + then: + properties: + reg: + minItems: 3 + maxItems: 3 + items: + - description: Registers for base DP functionality + - description: (Optional) Registers for HDCP device key injection + - description: (Optional) Registers for HDCP TrustZone interaction + else: + properties: + reg: + minItems: 1 + maxItems: 1 + items: + - description: Registers for base DP functionality + additionalProperties: false examples:@@ -99,8 +123,10 @@ examples: #include <dt-bindings/power/qcom-rpmpd.h> displayport-controller@ae90000 { - compatible = "qcom,sc7180-dp"; - reg = <0xae90000 0x1400>; + compatible = "qcom,sc7180-dp-hdcp"; + reg = <0 0x0ae90000 0 0x1400>, + <0 0x0aed1000 0 0x174>, + <0 0x0aee1000 0 0x2c>; interrupt-parent = <&mdss>; interrupts = <12>; clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Re: [PATCH v3 12/14] dt-bindings: msm/dp: Add bindings for HDCP registers
In reply to Sean PaulQuoted 81 lines · Sean Paul
From: Sean Paul <[email protected]>
This patch adds the bindings for the MSM DisplayPort HDCP registers which are required to write the HDCP key into the display controller as well as the registers to enable HDCP authentication/key exchange/encryption.
We'll use a new compatible string for this since the fields are optional.
Cc Rob Herring <[email protected]>Cc Stephen Boyd <[email protected]>Signed-off-by Sean Paul <[email protected]>Changes in v2:
(quoted diff) +0
-2-Drop register range names (Stephen) -Fix yaml errors (Rob)Changes in v3:
(quoted diff) +0
-5-Add new compatible string for dp-hdcp -Add descriptions to reg -Add minItems/maxItems to reg -Make reg depend on the new hdcp compatible string ---Disclaimer: I really don't know if this is the right way to approach this. I tried using examples from other bindings, but feedback would be very much welcome on how I could add the optional register ranges.
.../bindings/display/msm/dp-controller.yaml | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-)Documentation/devicetree/bindings/display/msm/dp-controller.yaml +26
-2@@ -17,9 +17,10 @@ properties: compatible: enum: - qcom,sc7180-dp + - qcom,sc7180-dp-hdcp - reg: - maxItems: 1 + # See compatible-specific constraints below. + reg: true interrupts: maxItems: 1@@ -89,6 +90,29 @@ required: - power-domains - ports +allOf: + - if: + properties: + compatible: + contains: + const: qcom,sc7180-dp-hdcp + then: + properties: + reg: + minItems: 3 + maxItems: 3 + items: + - description: Registers for base DP functionality + - description: (Optional) Registers for HDCP device key injection + - description: (Optional) Registers for HDCP TrustZone interaction + else: + properties: + reg: + minItems: 1 + maxItems: 1 + items: + - description: Registers for base DP functionality + additionalProperties: false examples:
Documentation/devicetree/bindings/display/msm/dp-controller.yaml examples: · line 129
Quoted 9 lines
Documentation/devicetree/bindings/display/msm/dp-controller.yaml +4
-2@@ -99,8 +123,10 @@ examples: #include <dt-bindings/power/qcom-rpmpd.h> displayport-controller@ae90000 { - compatible = "qcom,sc7180-dp"; - reg = <0xae90000 0x1400>; + compatible = "qcom,sc7180-dp-hdcp"; + reg = <0 0x0ae90000 0 0x1400>, + <0 0x0aed1000 0 0x174>, + <0 0x0aee1000 0 0x2c>;
Forgot to mention, #address-cells = #size-cells = <1> in the example "environment", so you have to omit the lone 0s in the example to make it pass the tests.
Regards,
Bjorn
Quoted 6 lines
Documentation/devicetree/bindings/display/msm/dp-controller.yaml +0
-0interrupt-parent = <&mdss>; interrupts = <12>; clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Sean Paul
reviewerPATCH v3 13/14 arm64: dts: qcom: sc7180: Add support for HDCP in dp-controller
In reply to Sean PaulFrom: Sean Paul <[email protected]>
This patch adds the register ranges required for HDCP key injection and HDCP TrustZone interaction as described in the dt-bindings for the sc7180 dp controller. Now that these are supported, change the compatible string to "dp-hdcp".
Changes in v3:
-Split off into a new patch containing just the dts change (Stephen) -Add hdcp compatible string (Stephen)
--- arch/arm64/boot/dts/qcom/sc7180.dtsi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sc7180.dtsi +4 -2
@@ -3085,10 +3085,12 @@ dsi_phy: dsi-phy@ae94400 { }; mdss_dp: displayport-controller@ae90000 { - compatible = "qcom,sc7180-dp"; + compatible = "qcom,sc7180-dp-hdcp"; status = "disabled"; - reg = <0 0x0ae90000 0 0x1400>; + reg = <0 0x0ae90000 0 0x1400>, + <0 0x0aed1000 0 0x174>, + <0 0x0aee1000 0 0x2c>; interrupt-parent = <&mdss>; interrupts = <12>;
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Sean Paul
reviewerPATCH v3 14/14 drm/msm: Implement HDCP 1.x using the new drm HDCP helpers
In reply to Sean PaulFrom: Sean Paul <[email protected]>
This patch adds HDCP 1.x support to msm DP connectors using the new HDCP helpers.
Changes in v2:
-Squash [1] into this patch with the following changes (Stephen)
-Update the sc7180 dtsi file
-Remove resource names and just use index (Stephen)
Changes in v3:
-Split out the dtsi change from v2 (Stephen)
-Fix set-but-unused warning identified by 0-day
-Fix up a couple of style nits (Stephen)
-Store HDCP key directly in dp_hdcp struct (Stephen) -Remove wmb in HDCP key initialization, move an_seed (Stephen) -Use FIELD_PREP for bstatus/bcaps (Stephen)
-#define read_poll_timeout values (Stephen)
-Remove unnecessary parentheses in dp_hdcp_store_ksv_fifo (Stephen) -Add compatible string for hdcp (Stephen)
-Rename dp_hdcp_write_* functions (Abhinav)
-Add 1us delay between An reads (Abhinav)
-Delete unused dp_hdcp_read_* functions
[1] https://patchwork.freedesktop.org/patch/msgid/[email protected]
--- drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/dp/dp_debug.c | 46 ++- drivers/gpu/drm/msm/dp/dp_debug.h | 6 +- drivers/gpu/drm/msm/dp/dp_display.c | 47 ++- drivers/gpu/drm/msm/dp/dp_display.h | 5 + drivers/gpu/drm/msm/dp/dp_drm.c | 68 ++++- drivers/gpu/drm/msm/dp/dp_drm.h | 5 + drivers/gpu/drm/msm/dp/dp_hdcp.c | 445 ++++++++++++++++++++++++++++ drivers/gpu/drm/msm/dp/dp_hdcp.h | 27 ++ drivers/gpu/drm/msm/dp/dp_parser.c | 23 +- drivers/gpu/drm/msm/dp/dp_parser.h | 4 + drivers/gpu/drm/msm/dp/dp_reg.h | 44 ++- drivers/gpu/drm/msm/msm_atomic.c | 15 + 13 files changed, 717 insertions(+), 19 deletions(-) create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.c create mode 100644 drivers/gpu/drm/msm/dp/dp_hdcp.h
drivers/gpu/drm/msm/Makefile +1 -0
@@ -109,6 +109,7 @@ msm-$(CONFIG_DRM_MSM_DP)+= dp/dp_aux.o \ dp/dp_ctrl.o \ dp/dp_display.o \ dp/dp_drm.o \ + dp/dp_hdcp.o \ dp/dp_hpd.o \ dp/dp_link.o \ dp/dp_panel.o \
drivers/gpu/drm/msm/dp/dp_debug.c +45 -1
94 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_debug.h +4 -2
@@ -6,6 +6,7 @@#ifndef _DP_DEBUG_H_#define _DP_DEBUG_H_ +#include "dp_hdcp.h" #include "dp_panel.h" #include "dp_link.h"
@@ -43,7 +44,7 @@ struct dp_debug {*/ struct dp_debug *dp_debug_get (struct device *dev,struct dp_panel *panel,struct dp_usbpd *usbpd,struct dp_link *link, -struct drm_connector **connector, +struct dp_hdcp *hdcp,struct drm_connector **connector,struct drm_minor *minor);/**
@@ -60,7 +61,8 @@ void dp_debug_put(struct dp_debug *dp_debug);static inline struct dp_debug *dp_debug_get (struct device *dev,struct dp_panel *panel,struct dp_usbpd *usbpd,struct dp_link *link, -struct drm_connector **connector,struct drm_minor *minor) +struct dp_hdcp *hdcp,struct drm_connector **connector, +struct drm_minor *minor) {return ERR_PTR (-EINVAL ); }
drivers/gpu/drm/msm/dp/dp_display.c +45 -2
112 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_display.h +5 -0
@@ -27,8 +27,13 @@ struct msm_dp {struct dp_audio *dp_audio; }; +struct drm_atomic_state ; +int dp_display_set_plugged_cb (struct msm_dp *dp_display,hdmi_codec_plugged_cb fn,struct device *codec_dev); +struct dp_hdcp *dp_display_connector_to_hdcp (struct drm_connector *connector); +void dp_display_hdcp_commit (struct msm_dp *dp_display, +struct drm_atomic_state *state);int dp_display_validate_mode (struct msm_dp *dp_display,u32 mode_pclk_khz);int dp_display_get_modes (struct msm_dp *dp_display,struct dp_display_mode *dp_mode);
drivers/gpu/drm/msm/dp/dp_drm.c +67 -1
104 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_drm.h +5 -0
@@ -14,5 +14,10 @@#include "dp_display.h" struct drm_connector *dp_drm_connector_init (struct msm_dp *dp_display); +struct msm_dp *msm_dp_from_connector (struct drm_connector *connector); +bool dp_drm_is_connector_msm_dp (struct drm_connector *connector); +void dp_drm_atomic_commit (struct drm_connector *connector, +struct drm_connector_state *conn_state, +struct drm_atomic_state *state);#endif /* _DP_DRM_H_ */
drivers/gpu/drm/msm/dp/dp_hdcp.c new file +445 -0
445 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_hdcp.h new file +27 -0
@@ -0,0 +1,27 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright (C) 2021 Google, Inc. +* +* Authors: +* Sean Paul <[email protected]> +*/ + +#ifndef DP_HDCP_H_ +#define DP_HDCP_H_ + +#define DP_HDCP_KEY_LEN 7 +#define DP_HDCP_NUM_KEYS 40 + +struct dp_hdcp ; +struct dp_parser ; +struct drm_atomic_state ; +struct drm_dp_aux ; + +struct dp_hdcp *dp_hdcp_get (struct dp_parser *parser,struct drm_dp_aux *aux); +void dp_hdcp_put (struct dp_hdcp *hdcp); + +int dp_hdcp_attach (struct dp_hdcp *hdcp,struct drm_connector *connector); +int dp_hdcp_ingest_key (struct dp_hdcp *hdcp,const u8 *raw_key,int raw_len); +void dp_hdcp_commit (struct dp_hdcp *hdcp,struct drm_atomic_state *state); + +#endif
drivers/gpu/drm/msm/dp/dp_parser.c +17 -6
@@ -3,6 +3,7 @@* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved. */ +#include <linux/of.h> #include <linux/of_gpio.h> #include <linux/phy/phy.h>
@@ -20,14 +21,13 @@ static const struct dp_regulator_cfg sdm845_dp_reg_cfg = { };static int msm_dss_ioremap (struct platform_device *pdev, -struct dss_io_data *io_data) +struct dss_io_data *io_data,int idx) {struct resource *res =NULL ; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + res =platform_get_resource (pdev,IORESOURCE_MEM , idx);if (!res) { -DRM_ERROR ("%pS->%s: msm_dss_get_res failed\n" , -__builtin_return_address (0 ), __func__); +DRM_ERROR ("Failed to map registers idx=%d\n" , idx);return -ENODEV ; }
@@ -55,6 +55,8 @@ static void dp_parser_unmap_io_resources(struct dp_parser *parser) {struct dp_io *io = &parser->io; +msm_dss_iounmap (&io->hdcp_tz); +msm_dss_iounmap (&io->hdcp_key);msm_dss_iounmap (&io->dp_controller); }
@@ -64,12 +66,21 @@ static int dp_parser_ctrl_res(struct dp_parser *parser)struct platform_device *pdev = parser->pdev;struct dp_io *io = &parser->io; - rc =msm_dss_ioremap (pdev, &io->dp_controller); + rc =msm_dss_ioremap (pdev, &io->dp_controller,0 );if (rc) { -DRM_ERROR ("unable to remap dp io resources, rc=%d\n" , rc); goto err; } +if (of_device_is_compatible (pdev->dev.of_node,"qcom,sc7180-dp-hdcp" )) { + rc =msm_dss_ioremap (pdev, &io->hdcp_key,1 ); +if (rc) + goto err; + + rc =msm_dss_ioremap (pdev, &io->hdcp_tz,2 ); +if (rc) + goto err; + } + io->phy =devm_phy_get (&pdev->dev,"dp" );if (IS_ERR (io->phy)) { rc =PTR_ERR (io->phy);
drivers/gpu/drm/msm/dp/dp_parser.h +4 -0
@@ -62,10 +62,14 @@ struct dp_display_data {* struct dp_ctrl_resource - controller's IO related data * * @dp_controller: Display Port controller mapped memory address +* @hdcp_key: mapped memory for HDCP key ingestion +* @hdcp_tz: mapped memory for HDCP TZ interaction * @phy_io: phy's mapped memory address */ struct dp_io {struct dss_io_data dp_controller; +struct dss_io_data hdcp_key; +struct dss_io_data hdcp_tz;struct phy *phy;union phy_configure_opts phy_opts; };
drivers/gpu/drm/msm/dp/dp_reg.h +37 -7
67 lines not on this page · raw message
drivers/gpu/drm/msm/msm_atomic.c +15 -0
@@ -8,6 +8,7 @@#include <drm/drm_gem_atomic_helper.h> #include <drm/drm_vblank.h> +#include "dp_drm.h" #include "msm_atomic_trace.h" #include "msm_drv.h" #include "msm_gem.h"
@@ -203,6 +204,18 @@ static unsigned get_crtc_mask(struct drm_atomic_state *state)return mask; } +static void msm_atomic_commit_connectors (struct drm_atomic_state *state) +{ +struct drm_connector_state *conn_state; +struct drm_connector *connector; +int i; + +for_each_new_connector_in_state (state, connector, conn_state, i) { +if (dp_drm_is_connector_msm_dp (connector)) +dp_drm_atomic_commit (connector, conn_state, state); + } +} +void msm_atomic_commit_tail (struct drm_atomic_state *state) {struct drm_device *dev = state->dev;
@@ -239,6 +252,8 @@ void msm_atomic_commit_tail(struct drm_atomic_state *state)drm_atomic_helper_commit_planes (dev, state,0 );drm_atomic_helper_commit_modeset_enables (dev, state); +msm_atomic_commit_connectors (state); +if (async) {struct msm_pending_timer *timer = &kms->pending_timers[drm_crtc_index (async_crtc)];
Signature · 1 line
Sean Paul, Software Engineer, Google / Chromium OS
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/hdcp: Pull HDCP auth/exchange/check into helpers (rev2)
In reply to Sean Paul== Series Details ==
== Series Details ==
Series: drm/hdcp: Pull HDCP auth/exchange/check into helpers (rev2)
URL : https://patchwork.freedesktop.org/series/94712/
State : failure
== Summary ==
Applying: drm/hdcp: Add drm_hdcp_atomic_check()
Applying: drm/hdcp: Avoid changing crtc state in hdcp atomic check
Applying: drm/hdcp: Update property value on content type and user changes
Applying: drm/hdcp: Expand HDCP helper library for enable/disable/check
Applying: drm/i915/hdcp: Consolidate HDCP setup/state cache
Applying: drm/i915/hdcp: Retain hdcp_capable return codes
Applying: drm/i915/hdcp: Use HDCP helpers for i915
error: sha1 information is lacking or useless (drivers/gpu/drm/i915/display/intel_display_debugfs.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0007 drm/i915/hdcp: Use HDCP helpers for i915
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".