linux-stable.git/drivers/gpu/drm/amd/display/modules/hdcp, branch linux-5.13.y

drm/amd/display: Avoid HDCP over-read and corruption

2021-07-19T08:04:35+00:00

[ Upstream commit 06888d571b513cbfc0b41949948def6cb81021b2 ]

Instead of reading the desired 5 bytes of the actual target field,
the code was reading 8. This could result in a corrupted value if the
trailing 3 bytes were non-zero, so instead use an appropriately sized
and zero-initialized bounce buffer, and read only 5 bytes before casting
to u64.

Signed-off-by: Kees Cook 
Signed-off-by: Alex Deucher 
Signed-off-by: Sasha Levin

drm/amd/display: fix HDCP reset sequence on reinitialize

2021-07-19T08:04:29+00:00

[ Upstream commit 99c248c41c2199bd34232ce8e729d18c4b343b64 ]

[why]
When setup is called after hdcp has already setup,
it would cause to disable HDCP flow won’t execute.

[how]
Don't clean up hdcp content to be 0.

Signed-off-by: Brandon Syu 
Reviewed-by: Wenjing Liu 
Acked-by: Wayne Lin 
Tested-by: Daniel Wheeler 
Signed-off-by: Alex Deucher 
Signed-off-by: Sasha Levin

drm/amd/display: Always poll for rxstatus in authenticate

2021-04-21T01:41:47+00:00

[Why]
Requirement from the spec - we shouldn't be potentially exiting out
early based on encryption status.

[How]
Drop the calls from HDCP1 and HDCP2 execution that exit out early
based on link encryption status.

Signed-off-by: Nicholas Kazlauskas 
Reviewed-by: Wenjing Liu 
Acked-by: Aurabindo Pillai 
Tested-by: Daniel Wheeler 
Signed-off-by: Alex Deucher

drm/amd/display: add handling for hdcp2 rx id list validation

2021-04-21T01:37:51+00:00

[why]
the current implementation of hdcp2 rx id list validation does not
have handler/checker for invalid message status, e.g. HMAC, the V
parameter calculated from PSP not matching the V prime from Rx.

[how]
return a generic FAILURE for any message status not SUCCESS or
REVOKED.

Signed-off-by: Dingchen (David) Zhang 
Reviewed-by: Bhawanpreet Lakha 
Acked-by: Aurabindo Pillai 
Tested-by: Daniel Wheeler 
Signed-off-by: Alex Deucher

drm/amd/display: add mod hdcp interface for supporting encryption state query

2021-04-09T20:48:15+00:00

Signed-off-by: Wenjing Liu 
Reviewed-by: George Shen 
Acked-by: Anson Jacob 
Tested-by: Dan Wheeler 
Signed-off-by: Alex Deucher

drm/amd/display: define mod_hdcp_display_disable_option struct

2021-04-09T20:48:11+00:00

Signed-off-by: Wenjing Liu 
Reviewed-by: George Shen 
Acked-by: Anson Jacob 
Tested-by: Dan Wheeler 
Signed-off-by: Alex Deucher

drm/amd/display: DP HDCP Compliance 1A-08/09 tests fail

2021-02-09T20:31:00+00:00

[Why]
Current implementation of mod_hdcp_hdcp2_validate_ake_cert()
does not process HDCP status message
TA_HDCP2_MSG_AUTHENTICATION_STATUS__SIGNATURE_CERTIFICAT_ERROR.
As a result, when there is a signature certificate error,
mod_hdcp_hdcp2_validate_ake_cert would return the default status,
which is success.

[How]
For all messages other than TA_HDCP2_MSG_AUTHENTICATION_STATUS__SUCCESS
and TA_HDCP2_MSG_AUTHENTICATION_STATUS__RECEIVERID_REVOKED, return status
as failure.

Signed-off-by: Qingqing Zhuo 
Reviewed-by: Bhawanpreet Lakha 
Acked-by: Anson Jacob 
Signed-off-by: Alex Deucher

drm/amd/display: correct some hdcp variable naming

2021-02-02T17:09:09+00:00

[why]
In HDCP update stream config interface, some variables are named as
xxx_supported, but in fact the variable indicates whether or not xxx_enabled.
Correct the naming so it is less confusing to read the code.

Signed-off-by: Wenjing Liu 
Reviewed-by: George Shen 
Acked-by: Anson Jacob 
Tested-by: Daniel Wheeler 
Signed-off-by: Alex Deucher

drm/amd/display: Modify the hdcp device count check condition

2020-12-23T20:01:34+00:00

[why]
Some MST display may not report the internal panel to DEVICE_COUNT,
that makes the check condition always failed.

[how]
To update this condition with the reported device count + 1
(because the immediate repeater's internal panel is possibly
not included in DEVICE_COUNT)

Signed-off-by: Martin Tsai 
Acked-by: Bindu Ramamurthy 
Signed-off-by: Alex Deucher

drm/amd/display: set hdcp1 wa re-auth delay to 200ms

2020-11-02T20:32:03+00:00

[Why]
Fail and restart timing for HDCP1 retry occurs too quickly.
This would cause some MST monitors to show black screen.

[How]
Adjusted timing of fail and restart to 200ms.

Signed-off-by: Jake Wang 
Reviewed-by: Wenjing Liu 
Acked-by: Qingqing Zhuo 
Signed-off-by: Alex Deucher