Commit 7ac851bc authored by Wenjing Liu's avatar Wenjing Liu Committed by Alex Deucher
Browse files

drm/amd/display: remove unused functions 



[why]
It has been decided that opm state query support will be dropped.
Therefore link encryption enabled and save current encryption states
won't be used anymore and there are no foreseeable usages in the future.
We will remove these two interfaces for clean up.

Acked-by: default avatarSolomon Chiu <solomon.chiu@amd.com>
Signed-off-by: default avatarWenjing Liu <wenjing.liu@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 40ef288f

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

+1 −3
Original line number Diff line number Diff line
@@ -655,10 +655,8 @@ struct hdcp_workqueue *hdcp_create_workqueue(struct amdgpu_device *adev, struct 
		INIT_DELAYED_WORK(&hdcp_work[i].property_validate_dwork, event_property_validate);



		hdcp_work[i].hdcp.config.psp.handle = &adev->psp;

		if (dc->ctx->dce_version == DCN_VERSION_3_1) {

		if (dc->ctx->dce_version == DCN_VERSION_3_1)

			hdcp_work[i].hdcp.config.psp.caps.dtm_v3_supported = 1;

			hdcp_work[i].hdcp.config.psp.caps.opm_state_query_supported = false;

		}

		hdcp_work[i].hdcp.config.ddc.handle = dc_get_link_at_index(dc, i);

		hdcp_work[i].hdcp.config.ddc.funcs.write_i2c = lp_write_i2c;

		hdcp_work[i].hdcp.config.ddc.funcs.read_i2c = lp_read_i2c;

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

+0 −6
Original line number Diff line number Diff line
@@ -315,9 +315,6 @@ enum mod_hdcp_status mod_hdcp_add_display(struct mod_hdcp *hdcp, 
		goto out;

	}



	/* save current encryption states to restore after next authentication */

	mod_hdcp_save_current_encryption_states(hdcp);



	/* reset existing authentication status */

	status = reset_authentication(hdcp, output);

	if (status != MOD_HDCP_STATUS_SUCCESS)
@@ -364,9 +361,6 @@ enum mod_hdcp_status mod_hdcp_remove_display(struct mod_hdcp *hdcp, 
		goto out;

	}



	/* save current encryption states to restore after next authentication */

	mod_hdcp_save_current_encryption_states(hdcp);



	/* stop current authentication */

	status = reset_authentication(hdcp, output);

	if (status != MOD_HDCP_STATUS_SUCCESS)

drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h

+0 −2
Original line number Diff line number Diff line
@@ -331,8 +331,6 @@ enum mod_hdcp_status mod_hdcp_add_display_to_topology( 
		struct mod_hdcp *hdcp, struct mod_hdcp_display *display);

enum mod_hdcp_status mod_hdcp_remove_display_from_topology(

		struct mod_hdcp *hdcp, uint8_t index);

bool mod_hdcp_is_link_encryption_enabled(struct mod_hdcp *hdcp);

void mod_hdcp_save_current_encryption_states(struct mod_hdcp *hdcp);

enum mod_hdcp_status mod_hdcp_hdcp1_create_session(struct mod_hdcp *hdcp);

enum mod_hdcp_status mod_hdcp_hdcp1_destroy_session(struct mod_hdcp *hdcp);

enum mod_hdcp_status mod_hdcp_hdcp1_validate_rx(struct mod_hdcp *hdcp);

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

+0 −6
Original line number Diff line number Diff line
@@ -266,9 +266,6 @@ static enum mod_hdcp_status authenticated(struct mod_hdcp *hdcp, 
	mod_hdcp_execute_and_set(mod_hdcp_hdcp1_link_maintenance,

			&input->link_maintenance, &status,

			hdcp, "link_maintenance");



	if (status != MOD_HDCP_STATUS_SUCCESS)

		mod_hdcp_save_current_encryption_states(hdcp);

out:

	return status;

}
@@ -447,9 +444,6 @@ static enum mod_hdcp_status authenticated_dp(struct mod_hdcp *hdcp, 
		mod_hdcp_execute_and_set(check_no_reauthentication_request_dp,

				&input->reauth_request_check, &status,

				hdcp, "reauth_request_check");



	if (status != MOD_HDCP_STATUS_SUCCESS)

		mod_hdcp_save_current_encryption_states(hdcp);

out:

	return status;

}

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

+0 −3
Original line number Diff line number Diff line
@@ -571,9 +571,6 @@ static enum mod_hdcp_status authenticated(struct mod_hdcp *hdcp, 
	}



	process_rxstatus(hdcp, event_ctx, input, &status);



	if (status != MOD_HDCP_STATUS_SUCCESS)

		mod_hdcp_save_current_encryption_states(hdcp);

out:

	return status;

}