Commit f4406d6f authored by Bhawanpreet Lakha's avatar Bhawanpreet Lakha Committed by Alex Deucher
Browse files

drm/amd/display: Load srm before enabling HDCP 



[Why]
we need to load SRM before we start HDCP. Because for S3 case the sysfs call will be
after we have already enabled HDCP, so we might not be using the latest SRM

[How]
Set srm before starting HDCP.

Signed-off-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Reviewed-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9037246b

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c

+7 −0
Original line number Diff line number Diff line
@@ -136,6 +136,13 @@ void hdcp_update_display(struct hdcp_workqueue *hdcp_work, 
		hdcp_w->link.adjust.hdcp2.force_type = MOD_HDCP_FORCE_TYPE_0;



		if (enable_encryption) {

			/* Explicitly set the saved SRM as sysfs call will be after we already enabled hdcp

			 * (s3 resume case)

			 */

			if (hdcp_work->srm_size > 0)

				psp_set_srm(hdcp_work->hdcp.config.psp.handle, hdcp_work->srm, hdcp_work->srm_size,

					    &hdcp_work->srm_version);



			display->adjust.disable = 0;

			if (content_type == DRM_MODE_HDCP_CONTENT_TYPE0)

				hdcp_w->link.adjust.hdcp2.force_type = MOD_HDCP_FORCE_TYPE_0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE