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

drm/amd/display: add force Type0/1 flag 



[Why]
Before we had a disable_type1 flag, this forced HDCP 2.2 to type0
There was no way to force type1.

[How]
Remove disable_type1 flag and instead add a flag to force type0/1.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -6838,7 +6838,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) 
		if (is_content_protection_different(new_con_state, old_con_state, connector, adev->dm.hdcp_workqueue))

			hdcp_update_display(

				adev->dm.hdcp_workqueue, aconnector->dc_link->link_index, aconnector,

				new_con_state->hdcp_content_type == DRM_MODE_HDCP_CONTENT_TYPE0 ? true : false,

				new_con_state->hdcp_content_type,

				new_con_state->content_protection == DRM_MODE_CONTENT_PROTECTION_DESIRED ? true

													 : false);

	}

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

+9 −3
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static void process_output(struct hdcp_workqueue *hdcp_work) 
void hdcp_update_display(struct hdcp_workqueue *hdcp_work,

			 unsigned int link_index,

			 struct amdgpu_dm_connector *aconnector,

			 bool disable_type1,

			 uint8_t content_type,

			 bool enable_encryption)

{

	struct hdcp_workqueue *hdcp_w = &hdcp_work[link_index];
@@ -108,9 +108,15 @@ void hdcp_update_display(struct hdcp_workqueue *hdcp_work, 
		memcpy(display, query.display, sizeof(struct mod_hdcp_display));

		mod_hdcp_remove_display(&hdcp_w->hdcp, aconnector->base.index, &hdcp_w->output);



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



		if (enable_encryption) {

			display->adjust.disable = 0;

			hdcp_w->link.adjust.hdcp2.disable_type1 = disable_type1;

			if (content_type == DRM_MODE_HDCP_CONTENT_TYPE0)

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

			else if (content_type == DRM_MODE_HDCP_CONTENT_TYPE1)

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



			schedule_delayed_work(&hdcp_w->property_validate_dwork,

					      msecs_to_jiffies(DRM_HDCP_CHECK_PERIOD_MS));

		} else {
@@ -308,7 +314,7 @@ static void update_config(void *handle, struct cp_psp_stream_config *config) 
	display->adjust.disable = 1;

	link->adjust.auth_delay = 2;



	hdcp_update_display(hdcp_work, link_index, aconnector, false, false);

	hdcp_update_display(hdcp_work, link_index, aconnector, DRM_MODE_HDCP_CONTENT_TYPE0, false);

}



struct hdcp_workqueue *hdcp_create_workqueue(void *psp_context, struct cp_psp *cp_psp, struct dc *dc)

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

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct hdcp_workqueue { 
void hdcp_update_display(struct hdcp_workqueue *hdcp_work,

			 unsigned int link_index,

			 struct amdgpu_dm_connector *aconnector,

			 bool disable_type1,

			 uint8_t content_type,

			 bool enable_encryption);



void hdcp_reset_display(struct hdcp_workqueue *work, unsigned int link_index);

drivers/gpu/drm/amd/display/modules/hdcp/hdcp2_transition.c

+1 −1
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ enum mod_hdcp_status mod_hdcp_hdcp2_dp_transition(struct mod_hdcp *hdcp, 
			break;

		} else if (input->link_integrity_check_dp != PASS) {

			if (hdcp->connection.hdcp2_retry_count >= 1)

				adjust->hdcp2.disable_type1 = 1;

				adjust->hdcp2.force_type = MOD_HDCP_FORCE_TYPE_0;

			fail_and_restart_in_ms(0, &status, output);

			break;

		} else if (event_ctx->rx_id_list_ready && conn->is_repeater) {

drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c

+5 −2
Original line number Diff line number Diff line
@@ -358,10 +358,13 @@ enum mod_hdcp_status mod_hdcp_hdcp2_create_session(struct mod_hdcp *hdcp) 


	hdcp_cmd->in_msg.hdcp2_create_session_v2.display_handle = display->index;



	if (hdcp->connection.link.adjust.hdcp2.disable_type1)

	if (hdcp->connection.link.adjust.hdcp2.force_type == MOD_HDCP_FORCE_TYPE_0)

		hdcp_cmd->in_msg.hdcp2_create_session_v2.negotiate_content_type =

			TA_HDCP2_CONTENT_TYPE_NEGOTIATION_TYPE__FORCE_TYPE0;

	else

	else if (hdcp->connection.link.adjust.hdcp2.force_type == MOD_HDCP_FORCE_TYPE_1)

		hdcp_cmd->in_msg.hdcp2_create_session_v2.negotiate_content_type =

			TA_HDCP2_CONTENT_TYPE_NEGOTIATION_TYPE__FORCE_TYPE1;

	else if (hdcp->connection.link.adjust.hdcp2.force_type == MOD_HDCP_FORCE_TYPE_MAX)

		hdcp_cmd->in_msg.hdcp2_create_session_v2.negotiate_content_type =

			TA_HDCP2_CONTENT_TYPE_NEGOTIATION_TYPE__MAX_SUPPORTED;

CRA Git | Maintained and supported by SUSTech CRA and CCSE