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: Solomon Chiu <solomon.chiu@amd.com>
Signed-off-by: Wenjing Liu <wenjing.liu@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
index e63c6885c7576aeaf9bdec810ab238df3690c7be..8e39e9245d063b9bb47e75873d5e40e5c6d97a33 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
@@ -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;

diff --git a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c
index 2bcab9c9b96e91484e93bf452152ad4f3001e10e..06d60f031a0680bf799035697ad2fb654e8c2498 100644 (file)
--- a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c
+++ b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c
@@ -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)

diff --git a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h
index 3ce91db560d1d2224025109719b6e8e221e105a5..7123f0915706cd721c9e309533465dedaa1dc40e 100644 (file)
--- a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h
+++ b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h
@@ -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);

diff --git a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c
index de872e7958b0657f61605f261f9eb2fd5400826b..6ec918af3bffc764f669d5bf166ca5e0ba349441 100644 (file)
--- a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c
+++ b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp1_execution.c
@@ -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;
 }

diff --git a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp2_execution.c b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp2_execution.c
index 117c6b45f71891bcc5786dc0f4152e82ccc457bd..91c22b96ebde7fc5446e78f2557ac3bb33b56020 100644 (file)
--- a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp2_execution.c
+++ b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp2_execution.c
@@ -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;
 }

diff --git a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c
index 1b02056bc8bdeff57e7d3e9bbddee55eae61207e..ade86a042398fbdca0cf183dd6a6b74664d4e991 100644 (file)
--- a/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c
+++ b/drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c
@@ -45,7 +45,7 @@ static void hdcp2_message_init(struct mod_hdcp *hdcp,
        in->process.msg3_desc.msg_size = 0;
 }
 
-static enum mod_hdcp_status mod_hdcp_remove_display_from_topology_v2(
+static enum mod_hdcp_status remove_display_from_topology_v2(
                struct mod_hdcp *hdcp, uint8_t index)
 {
        struct psp_context *psp = hdcp->config.psp.handle;
@@ -81,7 +81,7 @@ static enum mod_hdcp_status mod_hdcp_remove_display_from_topology_v2(
        return status;
 }
 
-static enum mod_hdcp_status mod_hdcp_remove_display_from_topology_v3(
+static enum mod_hdcp_status remove_display_from_topology_v3(
                struct mod_hdcp *hdcp, uint8_t index)
 {
        struct psp_context *psp = hdcp->config.psp.handle;
@@ -107,7 +107,7 @@ static enum mod_hdcp_status mod_hdcp_remove_display_from_topology_v3(
        psp_dtm_invoke(psp, dtm_cmd->cmd_id);
 
        if (dtm_cmd->dtm_status != TA_DTM_STATUS__SUCCESS) {
-               status = mod_hdcp_remove_display_from_topology_v2(hdcp, index);
+               status = remove_display_from_topology_v2(hdcp, index);
                if (status != MOD_HDCP_STATUS_SUCCESS)
                        display->state = MOD_HDCP_DISPLAY_INACTIVE;
        } else {
@@ -120,20 +120,7 @@ static enum mod_hdcp_status mod_hdcp_remove_display_from_topology_v3(
        return status;
 }
 
-enum mod_hdcp_status mod_hdcp_remove_display_from_topology(
-               struct mod_hdcp *hdcp, uint8_t index)
-{
-       enum mod_hdcp_status status = MOD_HDCP_STATUS_UPDATE_TOPOLOGY_FAILURE;
-
-       if (hdcp->config.psp.caps.dtm_v3_supported)
-               status = mod_hdcp_remove_display_from_topology_v3(hdcp, index);
-       else
-               status = mod_hdcp_remove_display_from_topology_v2(hdcp, index);
-
-       return status;
-}
-
-static enum mod_hdcp_status mod_hdcp_add_display_to_topology_v2(
+static enum mod_hdcp_status add_display_to_topology_v2(
                struct mod_hdcp *hdcp, struct mod_hdcp_display *display)
 {
        struct psp_context *psp = hdcp->config.psp.handle;
@@ -180,7 +167,7 @@ static enum mod_hdcp_status mod_hdcp_add_display_to_topology_v2(
        return status;
 }
 
-static enum mod_hdcp_status mod_hdcp_add_display_to_topology_v3(
+static enum mod_hdcp_status add_display_to_topology_v3(
                struct mod_hdcp *hdcp, struct mod_hdcp_display *display)
 {
        struct psp_context *psp = hdcp->config.psp.handle;
@@ -220,7 +207,7 @@ static enum mod_hdcp_status mod_hdcp_add_display_to_topology_v3(
        psp_dtm_invoke(psp, dtm_cmd->cmd_id);
 
        if (dtm_cmd->dtm_status != TA_DTM_STATUS__SUCCESS) {
-               status = mod_hdcp_add_display_to_topology_v2(hdcp, display);
+               status = add_display_to_topology_v2(hdcp, display);
                if (status != MOD_HDCP_STATUS_SUCCESS)
                        display->state = MOD_HDCP_DISPLAY_INACTIVE;
        } else {
@@ -232,15 +219,28 @@ static enum mod_hdcp_status mod_hdcp_add_display_to_topology_v3(
        return status;
 }
 
+enum mod_hdcp_status mod_hdcp_remove_display_from_topology(
+               struct mod_hdcp *hdcp, uint8_t index)
+{
+       enum mod_hdcp_status status = MOD_HDCP_STATUS_UPDATE_TOPOLOGY_FAILURE;
+
+       if (hdcp->config.psp.caps.dtm_v3_supported)
+               status = remove_display_from_topology_v3(hdcp, index);
+       else
+               status = remove_display_from_topology_v2(hdcp, index);
+
+       return status;
+}
+
 enum mod_hdcp_status mod_hdcp_add_display_to_topology(struct mod_hdcp *hdcp,
                                               struct mod_hdcp_display *display)
 {
        enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
 
        if (hdcp->config.psp.caps.dtm_v3_supported)
-               status = mod_hdcp_add_display_to_topology_v3(hdcp, display);
+               status = add_display_to_topology_v3(hdcp, display);
        else
-               status = mod_hdcp_add_display_to_topology_v2(hdcp, display);
+               status = add_display_to_topology_v2(hdcp, display);
 
        return status;
 }
@@ -1021,14 +1021,3 @@ enum mod_hdcp_status mod_hdcp_hdcp2_validate_stream_ready(struct mod_hdcp *hdcp)
        mutex_unlock(&psp->hdcp_context.mutex);
        return status;
 }
-
-bool mod_hdcp_is_link_encryption_enabled(struct mod_hdcp *hdcp)
-{
-       /* unsupported */
-       return true;
-}
-
-void mod_hdcp_save_current_encryption_states(struct mod_hdcp *hdcp)
-{
-       /* unsupported */
-}

diff --git a/drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h b/drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h
index c1b485f5fb71cec19431447e8541180af39ccc0d..a6eb86de8d5c77ffbd863a2c1ea6f52a86c4cec1 100644 (file)
--- a/drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h
+++ b/drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h
@@ -123,7 +123,6 @@ enum mod_hdcp_display_state {
 
 struct mod_hdcp_psp_caps {
        uint8_t dtm_v3_supported;
-       uint8_t opm_state_query_supported;
 };
 
 enum mod_hdcp_display_disable_option {