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

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

2021-07-19T08:00:52+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:00:43+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: add handling for hdcp2 rx id list validation

2021-05-19T08:56:18+00:00

[ Upstream commit 4ccf9446b2a3615615045346c97f8a1e2a16568a ]

[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 
Signed-off-by: Sasha Levin

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

drm/amd/display: remove unneeded semicolon

2020-10-30T05:03:02+00:00

A semicolon is not needed after a switch statement.

Signed-off-by: Tom Rix 
Signed-off-by: Alex Deucher

drm/amd/display: Don't log hdcp module warnings in dmesg

2020-09-17T21:56:47+00:00

[Why]
DTM topology updates happens by default now. This results in DTM
warnings when hdcp is not even being enabled. This spams the dmesg
and doesn't effect normal display functionality so it is better to log it
using DRM_DEBUG_KMS()

[How]
Change the DRM_WARN() to DRM_DEBUG_KMS()

Signed-off-by: Bhawanpreet Lakha 
Acked-by: Alex Deucher 
Reviewed-by: Rodrigo Siqueira 
Signed-off-by: Alex Deucher

drm/amd/display: Don't use DRM_ERROR() for DTM add topology

2020-09-15T21:52:41+00:00

[Why]
Previously we were only calling add_topology when hdcp was being enabled.
Now we call add_topology by default so the ERROR messages are printed if
the firmware is not loaded.

This error message is not relevant for normal display functionality so
no need to print a ERROR message.

[How]
Change DRM_ERROR to DRM_INFO

Signed-off-by: Bhawanpreet Lakha 
Acked-by: Aurabindo Pillai 
Signed-off-by: Alex Deucher