drm/amd: consolidate TA shared memory structures
Subsystems (3)
PATCH 1/1 drm/amd: consolidate TA shared memory structures
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 218 +++++++++--------- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 68 ++---- drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c | 4 +- .../gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 4 +- .../amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 12 +- .../drm/amd/display/modules/hdcp/hdcp_psp.c | 56 ++--- 6 files changed, 167 insertions(+), 195 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +109 -109
@@ -908,9 +908,9 @@ static int psp_xgmi_init_shared_buf(struct psp_context *psp)*/ ret =amdgpu_bo_create_kernel (psp->adev,PSP_XGMI_SHARED_MEM_SIZE ,PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM , - &psp->xgmi_context.xgmi_shared_bo, - &psp->xgmi_context.xgmi_shared_mc_addr, - &psp->xgmi_context.xgmi_shared_buf); + &psp->xgmi_context.context.mem_context.shared_bo, + &psp->xgmi_context.context.mem_context.shared_mc_addr, + &psp->xgmi_context.context.mem_context.shared_buf);return ret; }
@@ -957,15 +957,15 @@ static int psp_xgmi_load(struct psp_context *psp)psp_prep_ta_load_cmd_buf (cmd, psp->fw_pri_mc_addr, psp->xgmi.size_bytes, - psp->xgmi_context.xgmi_shared_mc_addr, + psp->xgmi_context.context.mem_context.shared_mc_addr,PSP_XGMI_SHARED_MEM_SIZE ); ret =psp_cmd_submit_buf (psp,NULL , cmd, psp->fence_buf_mc_addr);if (!ret) { - psp->xgmi_context.initialized =1 ; - psp->xgmi_context.session_id = cmd->resp.session_id; + psp->xgmi_context.context.initialized = true; + psp->xgmi_context.context.session_id = cmd->resp.session_id; }release_psp_cmd_buf (psp);
@@ -990,7 +990,7 @@ static int psp_xgmi_unload(struct psp_context *psp) cmd =acquire_psp_cmd_buf (psp); -psp_prep_ta_unload_cmd_buf (cmd, psp->xgmi_context.session_id); +psp_prep_ta_unload_cmd_buf (cmd, psp->xgmi_context.context.session_id); ret =psp_cmd_submit_buf (psp,NULL , cmd, psp->fence_buf_mc_addr);
@@ -1002,26 +1002,26 @@ static int psp_xgmi_unload(struct psp_context *psp)int psp_xgmi_invoke (struct psp_context *psp,uint32_t ta_cmd_id) { -return psp_ta_invoke (psp, ta_cmd_id, psp->xgmi_context.session_id); +return psp_ta_invoke (psp, ta_cmd_id, psp->xgmi_context.context.session_id); }int psp_xgmi_terminate (struct psp_context *psp) {int ret; -if (!psp->xgmi_context.initialized) +if (!psp->xgmi_context.context.initialized)return 0 ; ret =psp_xgmi_unload (psp);if (ret)return ret; - psp->xgmi_context.initialized =0 ; + psp->xgmi_context.context.initialized = false;/* free xgmi shared memory */ -amdgpu_bo_free_kernel (&psp->xgmi_context.xgmi_shared_bo, - &psp->xgmi_context.xgmi_shared_mc_addr, - &psp->xgmi_context.xgmi_shared_buf); +amdgpu_bo_free_kernel (&psp->xgmi_context.context.mem_context.shared_bo, + &psp->xgmi_context.context.mem_context.shared_mc_addr, + &psp->xgmi_context.context.mem_context.shared_buf);return 0 ; }
@@ -1036,7 +1036,7 @@ int psp_xgmi_initialize(struct psp_context *psp) !psp->xgmi.start_addr)return -ENOENT ; -if (!psp->xgmi_context.initialized) { +if (!psp->xgmi_context.context.initialized) { ret =psp_xgmi_init_shared_buf (psp);if (ret)return ret;
@@ -1048,7 +1048,7 @@ int psp_xgmi_initialize(struct psp_context *psp)return ret;/* Initialize XGMI session */ - xgmi_cmd = (struct ta_xgmi_shared_memory *)(psp->xgmi_context.xgmi_shared_buf); + xgmi_cmd = (struct ta_xgmi_shared_memory *)(psp->xgmi_context.context.mem_context.shared_buf);memset (xgmi_cmd,0 ,sizeof (struct ta_xgmi_shared_memory )); xgmi_cmd->cmd_id =TA_COMMAND_XGMI__INITIALIZE ;
@@ -1062,7 +1062,7 @@ int psp_xgmi_get_hive_id(struct psp_context *psp, uint64_t *hive_id)struct ta_xgmi_shared_memory *xgmi_cmd;int ret; - xgmi_cmd = (struct ta_xgmi_shared_memory *)psp->xgmi_context.xgmi_shared_buf; + xgmi_cmd = (struct ta_xgmi_shared_memory *)psp->xgmi_context.context.mem_context.shared_buf;memset (xgmi_cmd,0 ,sizeof (struct ta_xgmi_shared_memory )); xgmi_cmd->cmd_id =TA_COMMAND_XGMI__GET_HIVE_ID ;
@@ -1082,7 +1082,7 @@ int psp_xgmi_get_node_id(struct psp_context *psp, uint64_t *node_id)struct ta_xgmi_shared_memory *xgmi_cmd;int ret; - xgmi_cmd = (struct ta_xgmi_shared_memory *)psp->xgmi_context.xgmi_shared_buf; + xgmi_cmd = (struct ta_xgmi_shared_memory *)psp->xgmi_context.context.mem_context.shared_buf;memset (xgmi_cmd,0 ,sizeof (struct ta_xgmi_shared_memory )); xgmi_cmd->cmd_id =TA_COMMAND_XGMI__GET_NODE_ID ;
@@ -1116,7 +1116,7 @@ int psp_xgmi_get_topology_info(struct psp_context *psp,if (!topology || topology->num_nodes >TA_XGMI__MAX_CONNECTED_NODES )return -EINVAL ; - xgmi_cmd = (struct ta_xgmi_shared_memory *)psp->xgmi_context.xgmi_shared_buf; + xgmi_cmd = (struct ta_xgmi_shared_memory *)psp->xgmi_context.context.mem_context.shared_buf;memset (xgmi_cmd,0 ,sizeof (struct ta_xgmi_shared_memory ));/* Fill in the shared memory with topology information as input */
@@ -1177,7 +1177,7 @@ int psp_xgmi_set_topology_info(struct psp_context *psp,if (!topology || topology->num_nodes >TA_XGMI__MAX_CONNECTED_NODES )return -EINVAL ; - xgmi_cmd = (struct ta_xgmi_shared_memory *)psp->xgmi_context.xgmi_shared_buf; + xgmi_cmd = (struct ta_xgmi_shared_memory *)psp->xgmi_context.context.mem_context.shared_buf;memset (xgmi_cmd,0 ,sizeof (struct ta_xgmi_shared_memory )); topology_info_input = &xgmi_cmd->xgmi_in_message.get_topology_info;
@@ -1206,9 +1206,9 @@ static int psp_ras_init_shared_buf(struct psp_context *psp)*/ ret =amdgpu_bo_create_kernel (psp->adev,PSP_RAS_SHARED_MEM_SIZE ,PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM , - &psp->ras_context.ras_shared_bo, - &psp->ras_context.ras_shared_mc_addr, - &psp->ras_context.ras_shared_buf); + &psp->ras_context.context.mem_context.shared_bo, + &psp->ras_context.context.mem_context.shared_mc_addr, + &psp->ras_context.context.mem_context.shared_buf);return ret; }
@@ -1227,7 +1227,7 @@ static int psp_ras_load(struct psp_context *psp)psp_copy_fw (psp, psp->ras.start_addr, psp->ras.size_bytes); - ras_cmd = (struct ta_ras_shared_memory *)psp->ras_context.ras_shared_buf; + ras_cmd = (struct ta_ras_shared_memory *)psp->ras_context.context.mem_context.shared_buf;if (psp->adev->gmc.xgmi.connected_to_cpu) ras_cmd->ras_in_message.init_flags.poison_mode_en =1 ;
@@ -1239,17 +1239,17 @@ static int psp_ras_load(struct psp_context *psp)psp_prep_ta_load_cmd_buf (cmd, psp->fw_pri_mc_addr, psp->ras.size_bytes, - psp->ras_context.ras_shared_mc_addr, + psp->ras_context.context.mem_context.shared_mc_addr,PSP_RAS_SHARED_MEM_SIZE ); ret =psp_cmd_submit_buf (psp,NULL , cmd, psp->fence_buf_mc_addr);if (!ret) { - psp->ras_context.session_id = cmd->resp.session_id; + psp->ras_context.context.session_id = cmd->resp.session_id;if (!ras_cmd->ras_status) - psp->ras_context.ras_initialized = true; + psp->ras_context.context.initialized = true;else dev_warn (psp->adev->dev,"RAS Init Status: 0x%X\n" , ras_cmd->ras_status); }
@@ -1275,7 +1275,7 @@ static int psp_ras_unload(struct psp_context *psp) cmd =acquire_psp_cmd_buf (psp); -psp_prep_ta_unload_cmd_buf (cmd, psp->ras_context.session_id); +psp_prep_ta_unload_cmd_buf (cmd, psp->ras_context.context.session_id); ret =psp_cmd_submit_buf (psp,NULL , cmd, psp->fence_buf_mc_addr);
@@ -1290,7 +1290,7 @@ int psp_ras_invoke(struct psp_context *psp, uint32_t ta_cmd_id)struct ta_ras_shared_memory *ras_cmd;int ret; - ras_cmd = (struct ta_ras_shared_memory *)psp->ras_context.ras_shared_buf; + ras_cmd = (struct ta_ras_shared_memory *)psp->ras_context.context.mem_context.shared_buf;/* * TODO: bypass the loading in sriov for now
@@ -1298,7 +1298,7 @@ int psp_ras_invoke(struct psp_context *psp, uint32_t ta_cmd_id)if (amdgpu_sriov_vf (psp->adev))return 0 ; - ret =psp_ta_invoke (psp, ta_cmd_id, psp->ras_context.session_id); + ret =psp_ta_invoke (psp, ta_cmd_id, psp->ras_context.context.session_id);if (amdgpu_ras_intr_triggered ())return ret;
@@ -1354,10 +1354,10 @@ int psp_ras_enable_features(struct psp_context *psp,struct ta_ras_shared_memory *ras_cmd;int ret; -if (!psp->ras_context.ras_initialized) +if (!psp->ras_context.context.initialized)return -EINVAL ; - ras_cmd = (struct ta_ras_shared_memory *)psp->ras_context.ras_shared_buf; + ras_cmd = (struct ta_ras_shared_memory *)psp->ras_context.context.mem_context.shared_buf;memset (ras_cmd,0 ,sizeof (struct ta_ras_shared_memory ));if (enable)
@@ -1384,19 +1384,19 @@ static int psp_ras_terminate(struct psp_context *psp)if (amdgpu_sriov_vf (psp->adev))return 0 ; -if (!psp->ras_context.ras_initialized) +if (!psp->ras_context.context.initialized)return 0 ; ret =psp_ras_unload (psp);if (ret)return ret; - psp->ras_context.ras_initialized = false; + psp->ras_context.context.initialized = false;/* free ras shared memory */ -amdgpu_bo_free_kernel (&psp->ras_context.ras_shared_bo, - &psp->ras_context.ras_shared_mc_addr, - &psp->ras_context.ras_shared_buf); +amdgpu_bo_free_kernel (&psp->ras_context.context.mem_context.shared_bo, + &psp->ras_context.context.mem_context.shared_mc_addr, + &psp->ras_context.context.mem_context.shared_buf);return 0 ; }
@@ -1460,7 +1460,7 @@ static int psp_ras_initialize(struct psp_context *psp) } } -if (!psp->ras_context.ras_initialized) { +if (!psp->ras_context.context.initialized) { ret =psp_ras_init_shared_buf (psp);if (ret)return ret;
@@ -1479,10 +1479,10 @@ int psp_ras_trigger_error(struct psp_context *psp,struct ta_ras_shared_memory *ras_cmd;int ret; -if (!psp->ras_context.ras_initialized) +if (!psp->ras_context.context.initialized)return -EINVAL ; - ras_cmd = (struct ta_ras_shared_memory *)psp->ras_context.ras_shared_buf; + ras_cmd = (struct ta_ras_shared_memory *)psp->ras_context.context.mem_context.shared_buf;memset (ras_cmd,0 ,sizeof (struct ta_ras_shared_memory )); ras_cmd->cmd_id =TA_RAS_COMMAND__TRIGGER_ERROR ;
@@ -1512,9 +1512,9 @@ static int psp_hdcp_init_shared_buf(struct psp_context *psp)*/ ret =amdgpu_bo_create_kernel (psp->adev,PSP_HDCP_SHARED_MEM_SIZE ,PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM , - &psp->hdcp_context.hdcp_shared_bo, - &psp->hdcp_context.hdcp_shared_mc_addr, - &psp->hdcp_context.hdcp_shared_buf); + &psp->hdcp_context.context.mem_context.shared_bo, + &psp->hdcp_context.context.mem_context.shared_mc_addr, + &psp->hdcp_context.context.mem_context.shared_buf);return ret; }
@@ -1538,14 +1538,14 @@ static int psp_hdcp_load(struct psp_context *psp)psp_prep_ta_load_cmd_buf (cmd, psp->fw_pri_mc_addr, psp->hdcp.size_bytes, - psp->hdcp_context.hdcp_shared_mc_addr, + psp->hdcp_context.context.mem_context.shared_mc_addr,PSP_HDCP_SHARED_MEM_SIZE ); ret =psp_cmd_submit_buf (psp,NULL , cmd, psp->fence_buf_mc_addr);if (!ret) { - psp->hdcp_context.hdcp_initialized = true; - psp->hdcp_context.session_id = cmd->resp.session_id; + psp->hdcp_context.context.initialized = true; + psp->hdcp_context.context.session_id = cmd->resp.session_id;mutex_init (&psp->hdcp_context.mutex); }
@@ -1569,7 +1569,7 @@ static int psp_hdcp_initialize(struct psp_context *psp)return 0 ; } -if (!psp->hdcp_context.hdcp_initialized) { +if (!psp->hdcp_context.context.initialized) { ret =psp_hdcp_init_shared_buf (psp);if (ret)return ret;
@@ -1595,7 +1595,7 @@ static int psp_hdcp_unload(struct psp_context *psp) cmd =acquire_psp_cmd_buf (psp); -psp_prep_ta_unload_cmd_buf (cmd, psp->hdcp_context.session_id); +psp_prep_ta_unload_cmd_buf (cmd, psp->hdcp_context.context.session_id); ret =psp_cmd_submit_buf (psp,NULL , cmd, psp->fence_buf_mc_addr);
@@ -1612,7 +1612,7 @@ int psp_hdcp_invoke(struct psp_context *psp, uint32_t ta_cmd_id)if (amdgpu_sriov_vf (psp->adev))return 0 ; -return psp_ta_invoke (psp, ta_cmd_id, psp->hdcp_context.session_id); +return psp_ta_invoke (psp, ta_cmd_id, psp->hdcp_context.context.session_id); }static int psp_hdcp_terminate (struct psp_context *psp)
@@ -1625,8 +1625,8 @@ static int psp_hdcp_terminate(struct psp_context *psp)if (amdgpu_sriov_vf (psp->adev))return 0 ; -if (!psp->hdcp_context.hdcp_initialized) { -if (psp->hdcp_context.hdcp_shared_buf) +if (!psp->hdcp_context.context.initialized) { +if (psp->hdcp_context.context.mem_context.shared_buf) goto out;else return 0 ;
@@ -1636,13 +1636,13 @@ static int psp_hdcp_terminate(struct psp_context *psp)if (ret)return ret; - psp->hdcp_context.hdcp_initialized = false; + psp->hdcp_context.context.initialized = false; out:/* free hdcp shared memory */ -amdgpu_bo_free_kernel (&psp->hdcp_context.hdcp_shared_bo, - &psp->hdcp_context.hdcp_shared_mc_addr, - &psp->hdcp_context.hdcp_shared_buf); +amdgpu_bo_free_kernel (&psp->hdcp_context.context.mem_context.shared_bo, + &psp->hdcp_context.context.mem_context.shared_mc_addr, + &psp->hdcp_context.context.mem_context.shared_buf);return 0 ; }
@@ -1659,9 +1659,9 @@ static int psp_dtm_init_shared_buf(struct psp_context *psp)*/ ret =amdgpu_bo_create_kernel (psp->adev,PSP_DTM_SHARED_MEM_SIZE ,PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM , - &psp->dtm_context.dtm_shared_bo, - &psp->dtm_context.dtm_shared_mc_addr, - &psp->dtm_context.dtm_shared_buf); + &psp->dtm_context.context.mem_context.shared_bo, + &psp->dtm_context.context.mem_context.shared_mc_addr, + &psp->dtm_context.context.mem_context.shared_buf);return ret; }
@@ -1684,14 +1684,14 @@ static int psp_dtm_load(struct psp_context *psp)psp_prep_ta_load_cmd_buf (cmd, psp->fw_pri_mc_addr, psp->dtm.size_bytes, - psp->dtm_context.dtm_shared_mc_addr, + psp->dtm_context.context.mem_context.shared_mc_addr,PSP_DTM_SHARED_MEM_SIZE ); ret =psp_cmd_submit_buf (psp,NULL , cmd, psp->fence_buf_mc_addr);if (!ret) { - psp->dtm_context.dtm_initialized = true; - psp->dtm_context.session_id = cmd->resp.session_id; + psp->dtm_context.context.initialized = true; + psp->dtm_context.context.session_id = cmd->resp.session_id;mutex_init (&psp->dtm_context.mutex); }
@@ -1716,7 +1716,7 @@ static int psp_dtm_initialize(struct psp_context *psp)return 0 ; } -if (!psp->dtm_context.dtm_initialized) { +if (!psp->dtm_context.context.initialized) { ret =psp_dtm_init_shared_buf (psp);if (ret)return ret;
@@ -1742,7 +1742,7 @@ static int psp_dtm_unload(struct psp_context *psp) cmd =acquire_psp_cmd_buf (psp); -psp_prep_ta_unload_cmd_buf (cmd, psp->dtm_context.session_id); +psp_prep_ta_unload_cmd_buf (cmd, psp->dtm_context.context.session_id); ret =psp_cmd_submit_buf (psp,NULL , cmd, psp->fence_buf_mc_addr);
@@ -1759,7 +1759,7 @@ int psp_dtm_invoke(struct psp_context *psp, uint32_t ta_cmd_id)if (amdgpu_sriov_vf (psp->adev))return 0 ; -return psp_ta_invoke (psp, ta_cmd_id, psp->dtm_context.session_id); +return psp_ta_invoke (psp, ta_cmd_id, psp->dtm_context.context.session_id); }static int psp_dtm_terminate (struct psp_context *psp)
@@ -1772,8 +1772,8 @@ static int psp_dtm_terminate(struct psp_context *psp)if (amdgpu_sriov_vf (psp->adev))return 0 ; -if (!psp->dtm_context.dtm_initialized) { -if (psp->dtm_context.dtm_shared_buf) +if (!psp->dtm_context.context.initialized) { +if (psp->dtm_context.context.mem_context.shared_buf) goto out;else return 0 ;
@@ -1783,13 +1783,13 @@ static int psp_dtm_terminate(struct psp_context *psp)if (ret)return ret; - psp->dtm_context.dtm_initialized = false; + psp->dtm_context.context.initialized = false; out:/* free hdcp shared memory */ -amdgpu_bo_free_kernel (&psp->dtm_context.dtm_shared_bo, - &psp->dtm_context.dtm_shared_mc_addr, - &psp->dtm_context.dtm_shared_buf); +amdgpu_bo_free_kernel (&psp->dtm_context.context.mem_context.shared_bo, + &psp->dtm_context.context.mem_context.shared_mc_addr, + &psp->dtm_context.context.mem_context.shared_buf);return 0 ; }
@@ -1806,9 +1806,9 @@ static int psp_rap_init_shared_buf(struct psp_context *psp)*/ ret =amdgpu_bo_create_kernel (psp->adev,PSP_RAP_SHARED_MEM_SIZE ,PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM , - &psp->rap_context.rap_shared_bo, - &psp->rap_context.rap_shared_mc_addr, - &psp->rap_context.rap_shared_buf); + &psp->rap_context.context.mem_context.shared_bo, + &psp->rap_context.context.mem_context.shared_mc_addr, + &psp->rap_context.context.mem_context.shared_buf);return ret; }
@@ -1825,14 +1825,14 @@ static int psp_rap_load(struct psp_context *psp)psp_prep_ta_load_cmd_buf (cmd, psp->fw_pri_mc_addr, psp->rap.size_bytes, - psp->rap_context.rap_shared_mc_addr, + psp->rap_context.context.mem_context.shared_mc_addr,PSP_RAP_SHARED_MEM_SIZE ); ret =psp_cmd_submit_buf (psp,NULL , cmd, psp->fence_buf_mc_addr);if (!ret) { - psp->rap_context.rap_initialized = true; - psp->rap_context.session_id = cmd->resp.session_id; + psp->rap_context.context.initialized = true; + psp->rap_context.context.session_id = cmd->resp.session_id;mutex_init (&psp->rap_context.mutex); }
@@ -1846,7 +1846,7 @@ static int psp_rap_unload(struct psp_context *psp)int ret;struct psp_gfx_cmd_resp *cmd =acquire_psp_cmd_buf (psp); -psp_prep_ta_unload_cmd_buf (cmd, psp->rap_context.session_id); +psp_prep_ta_unload_cmd_buf (cmd, psp->rap_context.context.session_id); ret =psp_cmd_submit_buf (psp,NULL , cmd, psp->fence_buf_mc_addr);
@@ -1872,7 +1872,7 @@ static int psp_rap_initialize(struct psp_context *psp)return 0 ; } -if (!psp->rap_context.rap_initialized) { +if (!psp->rap_context.context.initialized) { ret =psp_rap_init_shared_buf (psp);if (ret)return ret;
@@ -1886,11 +1886,11 @@ static int psp_rap_initialize(struct psp_context *psp)if (ret || status !=TA_RAP_STATUS__SUCCESS ) {psp_rap_unload (psp); -amdgpu_bo_free_kernel (&psp->rap_context.rap_shared_bo, - &psp->rap_context.rap_shared_mc_addr, - &psp->rap_context.rap_shared_buf); +amdgpu_bo_free_kernel (&psp->rap_context.context.mem_context.shared_bo, + &psp->rap_context.context.mem_context.shared_mc_addr, + &psp->rap_context.context.mem_context.shared_buf); - psp->rap_context.rap_initialized = false; + psp->rap_context.context.initialized = false;dev_warn (psp->adev->dev,"RAP TA initialize fail (%d) status %d.\n" , ret, status);
@@ -1905,17 +1905,17 @@ static int psp_rap_terminate(struct psp_context *psp) {int ret; -if (!psp->rap_context.rap_initialized) +if (!psp->rap_context.context.initialized)return 0 ; ret =psp_rap_unload (psp); - psp->rap_context.rap_initialized = false; + psp->rap_context.context.initialized = false;/* free rap shared memory */ -amdgpu_bo_free_kernel (&psp->rap_context.rap_shared_bo, - &psp->rap_context.rap_shared_mc_addr, - &psp->rap_context.rap_shared_buf); +amdgpu_bo_free_kernel (&psp->rap_context.context.mem_context.shared_bo, + &psp->rap_context.context.mem_context.shared_mc_addr, + &psp->rap_context.context.mem_context.shared_buf);return ret; }
@@ -1925,7 +1925,7 @@ int psp_rap_invoke(struct psp_context *psp, uint32_t ta_cmd_id, enum ta_rap_statstruct ta_rap_shared_memory *rap_cmd;int ret =0 ; -if (!psp->rap_context.rap_initialized) +if (!psp->rap_context.context.initialized)return 0 ; if (ta_cmd_id != TA_CMD_RAP__INITIALIZE &&
@@ -1935,13 +1935,13 @@ int psp_rap_invoke(struct psp_context *psp, uint32_t ta_cmd_id, enum ta_rap_statmutex_lock (&psp->rap_context.mutex); rap_cmd = (struct ta_rap_shared_memory *) - psp->rap_context.rap_shared_buf; + psp->rap_context.context.mem_context.shared_buf;memset (rap_cmd,0 ,sizeof (struct ta_rap_shared_memory )); rap_cmd->cmd_id = ta_cmd_id; rap_cmd->validation_method_id =METHOD_A ; - ret =psp_ta_invoke (psp, rap_cmd->cmd_id, psp->rap_context.session_id); + ret =psp_ta_invoke (psp, rap_cmd->cmd_id, psp->rap_context.context.session_id);if (ret) goto out_unlock;
@@ -1966,9 +1966,9 @@ static int psp_securedisplay_init_shared_buf(struct psp_context *psp)*/ ret =amdgpu_bo_create_kernel (psp->adev,PSP_SECUREDISPLAY_SHARED_MEM_SIZE ,PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM , - &psp->securedisplay_context.securedisplay_shared_bo, - &psp->securedisplay_context.securedisplay_shared_mc_addr, - &psp->securedisplay_context.securedisplay_shared_buf); + &psp->securedisplay_context.context.mem_context.shared_bo, + &psp->securedisplay_context.context.mem_context.shared_mc_addr, + &psp->securedisplay_context.context.mem_context.shared_buf);return ret; }
@@ -1984,14 +1984,14 @@ static int psp_securedisplay_load(struct psp_context *psp)psp_prep_ta_load_cmd_buf (cmd, psp->fw_pri_mc_addr, psp->securedisplay.size_bytes, - psp->securedisplay_context.securedisplay_shared_mc_addr, + psp->securedisplay_context.context.mem_context.shared_mc_addr,PSP_SECUREDISPLAY_SHARED_MEM_SIZE ); ret =psp_cmd_submit_buf (psp,NULL , cmd, psp->fence_buf_mc_addr);if (!ret) { - psp->securedisplay_context.securedisplay_initialized = true; - psp->securedisplay_context.session_id = cmd->resp.session_id; + psp->securedisplay_context.context.initialized = true; + psp->securedisplay_context.context.session_id = cmd->resp.session_id;mutex_init (&psp->securedisplay_context.mutex); }
@@ -2005,7 +2005,7 @@ static int psp_securedisplay_unload(struct psp_context *psp)int ret;struct psp_gfx_cmd_resp *cmd =acquire_psp_cmd_buf (psp); -psp_prep_ta_unload_cmd_buf (cmd, psp->securedisplay_context.session_id); +psp_prep_ta_unload_cmd_buf (cmd, psp->securedisplay_context.context.session_id); ret =psp_cmd_submit_buf (psp,NULL , cmd, psp->fence_buf_mc_addr);
@@ -2031,7 +2031,7 @@ static int psp_securedisplay_initialize(struct psp_context *psp)return 0 ; } -if (!psp->securedisplay_context.securedisplay_initialized) { +if (!psp->securedisplay_context.context.initialized) { ret =psp_securedisplay_init_shared_buf (psp);if (ret)return ret;
@@ -2048,11 +2048,11 @@ static int psp_securedisplay_initialize(struct psp_context *psp)if (ret) {psp_securedisplay_unload (psp); -amdgpu_bo_free_kernel (&psp->securedisplay_context.securedisplay_shared_bo, - &psp->securedisplay_context.securedisplay_shared_mc_addr, - &psp->securedisplay_context.securedisplay_shared_buf); +amdgpu_bo_free_kernel (&psp->securedisplay_context.context.mem_context.shared_bo, + &psp->securedisplay_context.context.mem_context.shared_mc_addr, + &psp->securedisplay_context.context.mem_context.shared_buf); - psp->securedisplay_context.securedisplay_initialized = false; + psp->securedisplay_context.context.initialized = false;dev_err (psp->adev->dev,"SECUREDISPLAY TA initialize fail.\n" );return -EINVAL ;
@@ -2077,19 +2077,19 @@ static int psp_securedisplay_terminate(struct psp_context *psp)if (amdgpu_sriov_vf (psp->adev))return 0 ; -if (!psp->securedisplay_context.securedisplay_initialized) +if (!psp->securedisplay_context.context.initialized)return 0 ; ret =psp_securedisplay_unload (psp);if (ret)return ret; - psp->securedisplay_context.securedisplay_initialized = false; + psp->securedisplay_context.context.initialized = false;/* free securedisplay shared memory */ -amdgpu_bo_free_kernel (&psp->securedisplay_context.securedisplay_shared_bo, - &psp->securedisplay_context.securedisplay_shared_mc_addr, - &psp->securedisplay_context.securedisplay_shared_buf); +amdgpu_bo_free_kernel (&psp->securedisplay_context.context.mem_context.shared_bo, + &psp->securedisplay_context.context.mem_context.shared_mc_addr, + &psp->securedisplay_context.context.mem_context.shared_buf);return ret; }
@@ -2098,7 +2098,7 @@ int psp_securedisplay_invoke(struct psp_context *psp, uint32_t ta_cmd_id) {int ret; -if (!psp->securedisplay_context.securedisplay_initialized) +if (!psp->securedisplay_context.context.initialized)return -EINVAL ; if (ta_cmd_id != TA_SECUREDISPLAY_COMMAND__QUERY_TA &&
@@ -2107,7 +2107,7 @@ int psp_securedisplay_invoke(struct psp_context *psp, uint32_t ta_cmd_id)mutex_lock (&psp->securedisplay_context.mutex); - ret =psp_ta_invoke (psp, ta_cmd_id, psp->securedisplay_context.session_id); + ret =psp_ta_invoke (psp, ta_cmd_id, psp->securedisplay_context.context.session_id);mutex_unlock (&psp->securedisplay_context.mutex);
@@ -2727,7 +2727,7 @@ static int psp_suspend(void *handle)struct psp_context *psp = &adev->psp;if (adev->gmc.xgmi.num_physical_nodes >1 && - psp->xgmi_context.initialized ==1 ) { + psp->xgmi_context.context.initialized) { ret =psp_xgmi_terminate (psp);if (ret) {DRM_ERROR ("Failed to terminate xgmi ta\n" );
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +20 -48
89 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c +2 -2
@@ -76,7 +76,7 @@ static ssize_t amdgpu_rap_debugfs_write(struct file *f, const char __user *buf,dev_info (adev->dev,"RAP L0 validate test success.\n" ); }else { rap_shared_mem = (struct ta_rap_shared_memory *) - adev->psp.rap_context.rap_shared_buf; + adev->psp.rap_context.context.mem_context.shared_buf; rap_cmd_output = &(rap_shared_mem->rap_out_message.output);dev_info (adev->dev,"RAP test failed, the output is:\n" );
@@ -119,7 +119,7 @@ void amdgpu_rap_debugfs_init(struct amdgpu_device *adev)#if defined(CONFIG_DEBUG_FS )struct drm_minor *minor =adev_to_drm (adev)->primary; -if (!adev->psp.rap_context.rap_initialized) +if (!adev->psp.rap_context.context.initialized)return ; debugfs_create_file("rap_test", S_IWUSR, minor->debugfs_root,
drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c +2 -2
@@ -80,7 +80,7 @@ void psp_securedisplay_parse_resp_status(struct psp_context *psp,void psp_prep_securedisplay_cmd_buf (struct psp_context *psp,struct securedisplay_cmd **cmd,enum ta_securedisplay_command command_id) { - *cmd = (struct securedisplay_cmd *)psp->securedisplay_context.securedisplay_shared_buf; + *cmd = (struct securedisplay_cmd *)psp->securedisplay_context.context.mem_context.shared_buf;memset (*cmd,0 ,sizeof (struct securedisplay_cmd )); (*cmd)->status =TA_SECUREDISPLAY_STATUS__GENERIC_FAILURE ; (*cmd)->cmd_id = command_id;
@@ -170,7 +170,7 @@ void amdgpu_securedisplay_debugfs_init(struct amdgpu_device *adev) {#if defined(CONFIG_DEBUG_FS ) -if (!adev->psp.securedisplay_context.securedisplay_initialized) +if (!adev->psp.securedisplay_context.context.initialized)return ; debugfs_create_file("securedisplay_test", S_IWUSR, adev_to_drm(adev)->primary->debugfs_root,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c +6 -6
@@ -79,12 +79,12 @@ static uint8_t *psp_get_srm(struct psp_context *psp, uint32_t *srm_version, uintstruct ta_hdcp_shared_memory *hdcp_cmd; -if (!psp->hdcp_context.hdcp_initialized) { +if (!psp->hdcp_context.context.initialized) {DRM_WARN ("Failed to get hdcp srm. HDCP TA is not initialized." );return NULL ; } - hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf; + hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.context.mem_context.shared_buf;memset (hdcp_cmd,0 ,sizeof (struct ta_hdcp_shared_memory )); hdcp_cmd->cmd_id =TA_HDCP_COMMAND__HDCP_GET_SRM ;
@@ -105,12 +105,12 @@ static int psp_set_srm(struct psp_context *psp, uint8_t *srm, uint32_t srm_size,struct ta_hdcp_shared_memory *hdcp_cmd; -if (!psp->hdcp_context.hdcp_initialized) { +if (!psp->hdcp_context.context.initialized) {DRM_WARN ("Failed to get hdcp srm. HDCP TA is not initialized." );return -EINVAL ; } - hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf; + hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.context.mem_context.shared_buf;memset (hdcp_cmd,0 ,sizeof (struct ta_hdcp_shared_memory ));memcpy (hdcp_cmd->in_msg.hdcp_set_srm.srm_buf, srm, srm_size);
@@ -414,12 +414,12 @@ static bool enable_assr(void *handle, struct dc_link *link)struct ta_dtm_shared_memory *dtm_cmd;bool res = true; -if (!psp->dtm_context.dtm_initialized) { +if (!psp->dtm_context.context.initialized) {DRM_INFO ("Failed to enable ASSR, DTM TA is not initialized." );return false; } - dtm_cmd = (struct ta_dtm_shared_memory *)psp->dtm_context.dtm_shared_buf; + dtm_cmd = (struct ta_dtm_shared_memory *)psp->dtm_context.context.mem_context.shared_buf;mutex_lock (&psp->dtm_context.mutex);memset (dtm_cmd,0 ,sizeof (struct ta_dtm_shared_memory ));
drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c +28 -28
220 lines not on this page · raw message
Signature · 1 line
2.17.1
[AMD Official Use Only]
-----Original Message-----
From: Li, Candice <[email protected]>
Sent: Tuesday, August 17, 2021 5:11 PM
To: [email protected]
Cc: Clements, John <[email protected]>; Li, Candice <[email protected]>
Subject: [PATCH] drm/amd: consolidate TA shared memory structures
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 218 +++++++++--------- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 68 ++---- drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c | 4 +- .../gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 4 +- .../amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 12 +- .../drm/amd/display/modules/hdcp/hdcp_psp.c | 56 ++--- 6 files changed, 167 insertions(+), 195 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +17 -15
@@ -908,9 +908,9 @@ static int psp_xgmi_init_shared_buf(struct psp_context *psp)*/ ret =amdgpu_bo_create_kernel (psp->adev,PSP_XGMI_SHARED_MEM_SIZE ,PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM , - &psp->xgmi_context.xgmi_shared_bo, - &psp->xgmi_context.xgmi_shared_mc_addr, - &psp->xgmi_context.xgmi_shared_buf); + &psp->xgmi_context.context.mem_context.shared_bo, + &psp->xgmi_context.context.mem_context.shared_mc_addr, + &psp->xgmi_context.context.mem_context.shared_buf);return ret; }
@@ -957,15 +957,15 @@ static int psp_xgmi_load(struct psp_context *psp)psp_prep_ta_load_cmd_buf (cmd, psp->fw_pri_mc_addr, psp->xgmi.size_bytes, - psp->xgmi_context.xgmi_shared_mc_addr, + psp->xgmi_context.context.mem_context.shared_mc_addr,PSP_XGMI_SHARED_MEM_SIZE ); ret =psp_cmd_submit_buf (psp,NULL , cmd, psp->fence_buf_mc_addr);if (!ret) { - psp->xgmi_context.initialized =1 ; - psp->xgmi_context.session_id = cmd->resp.session_id; + psp->xgmi_context.context.initialized = true; + psp->xgmi_context.context.session_id = cmd->resp.session_id; }release_psp_cmd_buf (psp);
@@ -990,7 +990,7 @@ static int psp_xgmi_unload(struct psp_context *psp) cmd =acquire_psp_cmd_buf (psp); -psp_prep_ta_unload_cmd_buf (cmd, psp->xgmi_context.session_id); +psp_prep_ta_unload_cmd_buf (cmd, psp->xgmi_context.context.session_id); ret =psp_cmd_submit_buf (psp,NULL , cmd, psp->fence_buf_mc_addr);
@@ -1002,26 +1002,26 @@ static int psp_xgmi_unload(struct psp_context *psp)int psp_xgmi_invoke (struct psp_context *psp,uint32_t ta_cmd_id) { -return psp_ta_invoke (psp, ta_cmd_id, psp->xgmi_context.session_id); +return psp_ta_invoke (psp, ta_cmd_id, +psp->xgmi_context.context.session_id); }int psp_xgmi_terminate (struct psp_context *psp) {int ret; -if (!psp->xgmi_context.initialized) +if (!psp->xgmi_context.context.initialized)return 0 ; ret =psp_xgmi_unload (psp);if (ret)return ret; - psp->xgmi_context.initialized =0 ; + psp->xgmi_context.context.initialized = false;/* free xgmi shared memory */ -amdgpu_bo_free_kernel (&psp->xgmi_context.xgmi_shared_bo, - &psp->xgmi_context.xgmi_shared_mc_addr, - &psp->xgmi_context.xgmi_shared_buf); +amdgpu_bo_free_kernel (&psp->xgmi_context.context.mem_context.shared_bo, + &psp->xgmi_context.context.mem_context.shared_mc_addr, + &psp->xgmi_context.context.mem_context.shared_buf);return 0 ; }
@@ -1036,7 +1036,7 @@ int psp_xgmi_initialize(struct psp_context *psp) !psp->xgmi.start_addr)return -ENOENT ; -if (!psp->xgmi_context.initialized) { +if (!psp->xgmi_context.context.initialized) { ret =psp_xgmi_init_shared_buf (psp);if (ret)return ret;
@@ -1048,7 +1048,7 @@ int psp_xgmi_initialize(struct psp_context *psp)return ret;/* Initialize XGMI session */ - xgmi_cmd = (struct ta_xgmi_shared_memory *)(psp->xgmi_context.xgmi_shared_buf); + xgmi_cmd = (struct ta_xgmi_shared_memory +*)(psp->xgmi_context.context.mem_context.shared_buf);memset (xgmi_cmd,0 ,sizeof (struct ta_xgmi_shared_memory )); xgmi_cmd->cmd_id =TA_COMMAND_XGMI__INITIALIZE ;
@@ -1062,7 +1062,7 @@ int psp_xgmi_get_hive_id(struct psp_context *psp, uint64_t *hive_id)
struct ta_xgmi_shared_memory *xgmi_cmd;
int ret;
- xgmi_cmd = (struct ta_xgmi_shared_memory *)psp->xgmi_context.xgmi_shared_buf;
+ xgmi_cmd = (struct ta_xgmi_shared_memory
+*)psp->xgmi_context.context.mem_context.shared_buf;
memset(xgmi_cmd, 0, sizeof(struct ta_xgmi_shared_memory));
xgmi_cmd->cmd_id = TA_COMMAND_XGMI__GET_HIVE_ID; @@ -1082,7 +1082,7 @@ int psp_xgmi_get_node_id(struct psp_context *psp, uint64_t *node_id) struct ta_xgmi_shared_memory *xgmi_cmd;
int ret;
- xgmi_cmd = (struct ta_xgmi_shared_memory *)psp->xgmi_context.xgmi_shared_buf;
+ xgmi_cmd = (struct ta_xgmi_shared_memory
+*)psp->xgmi_context.context.mem_context.shared_buf;
memset(xgmi_cmd, 0, sizeof(struct ta_xgmi_shared_memory));
xgmi_cmd->cmd_id = TA_COMMAND_XGMI__GET_NODE_ID; @@ -1116,7 +1116,7 @@ int psp_xgmi_get_topology_info(struct psp_context *psp, if (!topology || topology->num_nodes > TA_XGMI__MAX_CONNECTED_NODES)
return -EINVAL;
- xgmi_cmd = (struct ta_xgmi_shared_memory *)psp->xgmi_context.xgmi_shared_buf;
+ xgmi_cmd = (struct ta_xgmi_shared_memory
+*)psp->xgmi_context.context.mem_context.shared_buf;
memset(xgmi_cmd, 0, sizeof(struct ta_xgmi_shared_memory));
/* Fill in the shared memory with topology information as input */ @@ -1177,7 +1177,7 @@ int psp_xgmi_set_topology_info(struct psp_context *psp, if (!topology || topology->num_nodes > TA_XGMI__MAX_CONNECTED_NODES)
return -EINVAL;
- xgmi_cmd = (struct ta_xgmi_shared_memory *)psp->xgmi_context.xgmi_shared_buf;
+ xgmi_cmd = (struct ta_xgmi_shared_memory
+*)psp->xgmi_context.context.mem_context.shared_buf;
memset(xgmi_cmd, 0, sizeof(struct ta_xgmi_shared_memory));
topology_info_input = &xgmi_cmd->xgmi_in_message.get_topology_info;
@@ -1206,9 +1206,9 @@ static int psp_ras_init_shared_buf(struct psp_context *psp)
*/
ret = amdgpu_bo_create_kernel(psp->adev, PSP_RAS_SHARED_MEM_SIZE,
PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM,
- &psp->ras_context.ras_shared_bo,
- &psp->ras_context.ras_shared_mc_addr,
- &psp->ras_context.ras_shared_buf);
+ &psp->ras_context.context.mem_context.shared_bo,
+ &psp->ras_context.context.mem_context.shared_mc_addr,
+ &psp->ras_context.context.mem_context.shared_buf);
return ret;
}
@@ -1227,7 +1227,7 @@ static int psp_ras_load(struct psp_context *psp)
psp_copy_fw(psp, psp->ras.start_addr, psp->ras.size_bytes);
- ras_cmd = (struct ta_ras_shared_memory *)psp->ras_context.ras_shared_buf;
+ ras_cmd = (struct ta_ras_shared_memory
+*)psp->ras_context.context.mem_context.shared_buf;
if (psp->adev->gmc.xgmi.connected_to_cpu)
ras_cmd->ras_in_message.init_flags.poison_mode_en = 1; @@ -1239,17 +1239,17 @@ static int psp_ras_load(struct psp_context *psp)
psp_prep_ta_load_cmd_buf(cmd,
psp->fw_pri_mc_addr,
psp->ras.size_bytes,
- psp->ras_context.ras_shared_mc_addr,
+ psp->ras_context.context.mem_context.shared_mc_addr,
PSP_RAS_SHARED_MEM_SIZE);
ret = psp_cmd_submit_buf(psp, NULL, cmd,
psp->fence_buf_mc_addr);
if (!ret) {
- psp->ras_context.session_id = cmd->resp.session_id;
+ psp->ras_context.context.session_id = cmd->resp.session_id;
if (!ras_cmd->ras_status)
- psp->ras_context.ras_initialized = true;
+ psp->ras_context.context.initialized = true;
else
dev_warn(psp->adev->dev, "RAS Init Status: 0x%X\n", ras_cmd->ras_status);
}
@@ -1275,7 +1275,7 @@ static int psp_ras_unload(struct psp_context *psp)
cmd = acquire_psp_cmd_buf(psp);
- psp_prep_ta_unload_cmd_buf(cmd, psp->ras_context.session_id);
+ psp_prep_ta_unload_cmd_buf(cmd, psp->ras_context.context.session_id);
ret = psp_cmd_submit_buf(psp, NULL, cmd,
psp->fence_buf_mc_addr);
@@ -1290,7 +1290,7 @@ int psp_ras_invoke(struct psp_context *psp, uint32_t ta_cmd_id)
struct ta_ras_shared_memory *ras_cmd;
int ret;
- ras_cmd = (struct ta_ras_shared_memory *)psp->ras_context.ras_shared_buf;
+ ras_cmd = (struct ta_ras_shared_memory
+*)psp->ras_context.context.mem_context.shared_buf;
/*
* TODO: bypass the loading in sriov for now @@ -1298,7 +1298,7 @@ int psp_ras_invoke(struct psp_context *psp, uint32_t ta_cmd_id)
if (amdgpu_sriov_vf(psp->adev))
return 0;
- ret = psp_ta_invoke(psp, ta_cmd_id, psp->ras_context.session_id);
+ ret = psp_ta_invoke(psp, ta_cmd_id,
+psp->ras_context.context.session_id);
if (amdgpu_ras_intr_triggered())
return ret;
@@ -1354,10 +1354,10 @@ int psp_ras_enable_features(struct psp_context *psp,
struct ta_ras_shared_memory *ras_cmd;
int ret;
- if (!psp->ras_context.ras_initialized)
+ if (!psp->ras_context.context.initialized)
return -EINVAL;
- ras_cmd = (struct ta_ras_shared_memory *)psp->ras_context.ras_shared_buf;
+ ras_cmd = (struct ta_ras_shared_memory
+*)psp->ras_context.context.mem_context.shared_buf;
memset(ras_cmd, 0, sizeof(struct ta_ras_shared_memory));
if (enable)
@@ -1384,19 +1384,19 @@ static int psp_ras_terminate(struct psp_context *psp)
if (amdgpu_sriov_vf(psp->adev))
return 0;
- if (!psp->ras_context.ras_initialized)
+ if (!psp->ras_context.context.initialized)
return 0;
ret = psp_ras_unload(psp);
if (ret)
return ret;
- psp->ras_context.ras_initialized = false;
+ psp->ras_context.context.initialized = false;
/* free ras shared memory */
- amdgpu_bo_free_kernel(&psp->ras_context.ras_shared_bo,
- &psp->ras_context.ras_shared_mc_addr,
- &psp->ras_context.ras_shared_buf);
+ amdgpu_bo_free_kernel(&psp->ras_context.context.mem_context.shared_bo,
+ &psp->ras_context.context.mem_context.shared_mc_addr,
+ &psp->ras_context.context.mem_context.shared_buf);
return 0;
}
@@ -1460,7 +1460,7 @@ static int psp_ras_initialize(struct psp_context *psp)
}
}
- if (!psp->ras_context.ras_initialized) {
+ if (!psp->ras_context.context.initialized) {
ret = psp_ras_init_shared_buf(psp);
if (ret)
return ret;
@@ -1479,10 +1479,10 @@ int psp_ras_trigger_error(struct psp_context *psp,
struct ta_ras_shared_memory *ras_cmd;
int ret;
- if (!psp->ras_context.ras_initialized)
+ if (!psp->ras_context.context.initialized)
return -EINVAL;
- ras_cmd = (struct ta_ras_shared_memory *)psp->ras_context.ras_shared_buf;
+ ras_cmd = (struct ta_ras_shared_memory
+*)psp->ras_context.context.mem_context.shared_buf;
memset(ras_cmd, 0, sizeof(struct ta_ras_shared_memory));
ras_cmd->cmd_id = TA_RAS_COMMAND__TRIGGER_ERROR; @@ -1512,9 +1512,9 @@ static int psp_hdcp_init_shared_buf(struct psp_context *psp)
*/
ret = amdgpu_bo_create_kernel(psp->adev, PSP_HDCP_SHARED_MEM_SIZE,
PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM,
- &psp->hdcp_context.hdcp_shared_bo, - &psp->hdcp_context.hdcp_shared_mc_addr, - &psp->hdcp_context.hdcp_shared_buf); + &psp->hdcp_context.context.mem_context.shared_bo, + &psp->hdcp_context.context.mem_context.shared_mc_addr, + &psp->hdcp_context.context.mem_context.shared_buf);
return ret;
}
@@ -1538,14 +1538,14 @@ static int psp_hdcp_load(struct psp_context *psp)
psp_prep_ta_load_cmd_buf(cmd,
psp->fw_pri_mc_addr, psp->hdcp.size_bytes,
- psp->hdcp_context.hdcp_shared_mc_addr,
+ psp->hdcp_context.context.mem_context.shared_mc_addr,
PSP_HDCP_SHARED_MEM_SIZE);
ret = psp_cmd_submit_buf(psp, NULL, cmd, psp->fence_buf_mc_addr);
if (!ret) {
- psp->hdcp_context.hdcp_initialized = true;
- psp->hdcp_context.session_id = cmd->resp.session_id;
+ psp->hdcp_context.context.initialized = true;
+ psp->hdcp_context.context.session_id = cmd->resp.session_id;
mutex_init(&psp->hdcp_context.mutex);
}
@@ -1569,7 +1569,7 @@ static int psp_hdcp_initialize(struct psp_context *psp)
return 0;
}
- if (!psp->hdcp_context.hdcp_initialized) {
+ if (!psp->hdcp_context.context.initialized) {
ret = psp_hdcp_init_shared_buf(psp);
if (ret)
return ret;
@@ -1595,7 +1595,7 @@ static int psp_hdcp_unload(struct psp_context *psp)
cmd = acquire_psp_cmd_buf(psp);
- psp_prep_ta_unload_cmd_buf(cmd, psp->hdcp_context.session_id);
+ psp_prep_ta_unload_cmd_buf(cmd, psp->hdcp_context.context.session_id);
ret = psp_cmd_submit_buf(psp, NULL, cmd, psp->fence_buf_mc_addr);
@@ -1612,7 +1612,7 @@ int psp_hdcp_invoke(struct psp_context *psp, uint32_t ta_cmd_id)
if (amdgpu_sriov_vf(psp->adev))
return 0;
- return psp_ta_invoke(psp, ta_cmd_id, psp->hdcp_context.session_id);
+ return psp_ta_invoke(psp, ta_cmd_id,
+psp->hdcp_context.context.session_id);
}
static int psp_hdcp_terminate(struct psp_context *psp) @@ -1625,8 +1625,8 @@ static int psp_hdcp_terminate(struct psp_context *psp)
if (amdgpu_sriov_vf(psp->adev))
return 0;
- if (!psp->hdcp_context.hdcp_initialized) {
- if (psp->hdcp_context.hdcp_shared_buf)
+ if (!psp->hdcp_context.context.initialized) {
+ if (psp->hdcp_context.context.mem_context.shared_buf)
goto out;
else
return 0;
@@ -1636,13 +1636,13 @@ static int psp_hdcp_terminate(struct psp_context *psp)
if (ret)
return ret;
- psp->hdcp_context.hdcp_initialized = false;
+ psp->hdcp_context.context.initialized = false;
out:
/* free hdcp shared memory */
- amdgpu_bo_free_kernel(&psp->hdcp_context.hdcp_shared_bo,
- &psp->hdcp_context.hdcp_shared_mc_addr,
- &psp->hdcp_context.hdcp_shared_buf);
+ amdgpu_bo_free_kernel(&psp->hdcp_context.context.mem_context.shared_bo,
+ &psp->hdcp_context.context.mem_context.shared_mc_addr,
+ &psp->hdcp_context.context.mem_context.shared_buf);
return 0;
}
@@ -1659,9 +1659,9 @@ static int psp_dtm_init_shared_buf(struct psp_context *psp)
*/
ret = amdgpu_bo_create_kernel(psp->adev, PSP_DTM_SHARED_MEM_SIZE,
PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM,
- &psp->dtm_context.dtm_shared_bo, - &psp->dtm_context.dtm_shared_mc_addr, - &psp->dtm_context.dtm_shared_buf); + &psp->dtm_context.context.mem_context.shared_bo, + &psp->dtm_context.context.mem_context.shared_mc_addr, + &psp->dtm_context.context.mem_context.shared_buf);
return ret;
}
@@ -1684,14 +1684,14 @@ static int psp_dtm_load(struct psp_context *psp)
psp_prep_ta_load_cmd_buf(cmd,
psp->fw_pri_mc_addr, psp->dtm.size_bytes,
- psp->dtm_context.dtm_shared_mc_addr,
+ psp->dtm_context.context.mem_context.shared_mc_addr,
PSP_DTM_SHARED_MEM_SIZE);
ret = psp_cmd_submit_buf(psp, NULL, cmd, psp->fence_buf_mc_addr);
if (!ret) {
- psp->dtm_context.dtm_initialized = true;
- psp->dtm_context.session_id = cmd->resp.session_id;
+ psp->dtm_context.context.initialized = true;
+ psp->dtm_context.context.session_id = cmd->resp.session_id;
mutex_init(&psp->dtm_context.mutex);
}
@@ -1716,7 +1716,7 @@ static int psp_dtm_initialize(struct psp_context *psp)
return 0;
}
- if (!psp->dtm_context.dtm_initialized) {
+ if (!psp->dtm_context.context.initialized) {
ret = psp_dtm_init_shared_buf(psp);
if (ret)
return ret;
@@ -1742,7 +1742,7 @@ static int psp_dtm_unload(struct psp_context *psp)
cmd = acquire_psp_cmd_buf(psp);
- psp_prep_ta_unload_cmd_buf(cmd, psp->dtm_context.session_id);
+ psp_prep_ta_unload_cmd_buf(cmd, psp->dtm_context.context.session_id);
ret = psp_cmd_submit_buf(psp, NULL, cmd, psp->fence_buf_mc_addr);
@@ -1759,7 +1759,7 @@ int psp_dtm_invoke(struct psp_context *psp, uint32_t ta_cmd_id)
if (amdgpu_sriov_vf(psp->adev))
return 0;
- return psp_ta_invoke(psp, ta_cmd_id, psp->dtm_context.session_id);
+ return psp_ta_invoke(psp, ta_cmd_id,
+psp->dtm_context.context.session_id);
}
static int psp_dtm_terminate(struct psp_context *psp) @@ -1772,8 +1772,8 @@ static int psp_dtm_terminate(struct psp_context *psp)
if (amdgpu_sriov_vf(psp->adev))
return 0;
- if (!psp->dtm_context.dtm_initialized) {
- if (psp->dtm_context.dtm_shared_buf)
+ if (!psp->dtm_context.context.initialized) {
+ if (psp->dtm_context.context.mem_context.shared_buf)
goto out;
else
return 0;
@@ -1783,13 +1783,13 @@ static int psp_dtm_terminate(struct psp_context *psp)
if (ret)
return ret;
- psp->dtm_context.dtm_initialized = false;
+ psp->dtm_context.context.initialized = false;
out:
/* free hdcp shared memory */
- amdgpu_bo_free_kernel(&psp->dtm_context.dtm_shared_bo,
- &psp->dtm_context.dtm_shared_mc_addr,
- &psp->dtm_context.dtm_shared_buf);
+ amdgpu_bo_free_kernel(&psp->dtm_context.context.mem_context.shared_bo,
+ &psp->dtm_context.context.mem_context.shared_mc_addr,
+ &psp->dtm_context.context.mem_context.shared_buf);
return 0;
}
@@ -1806,9 +1806,9 @@ static int psp_rap_init_shared_buf(struct psp_context *psp)
*/
ret = amdgpu_bo_create_kernel(psp->adev, PSP_RAP_SHARED_MEM_SIZE,
PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM,
- &psp->rap_context.rap_shared_bo, - &psp->rap_context.rap_shared_mc_addr, - &psp->rap_context.rap_shared_buf); + &psp->rap_context.context.mem_context.shared_bo, + &psp->rap_context.context.mem_context.shared_mc_addr, + &psp->rap_context.context.mem_context.shared_buf);
return ret;
}
@@ -1825,14 +1825,14 @@ static int psp_rap_load(struct psp_context *psp)
psp_prep_ta_load_cmd_buf(cmd,
psp->fw_pri_mc_addr, psp->rap.size_bytes,
- psp->rap_context.rap_shared_mc_addr,
+ psp->rap_context.context.mem_context.shared_mc_addr,
PSP_RAP_SHARED_MEM_SIZE);
ret = psp_cmd_submit_buf(psp, NULL, cmd, psp->fence_buf_mc_addr);
if (!ret) {
- psp->rap_context.rap_initialized = true;
- psp->rap_context.session_id = cmd->resp.session_id;
+ psp->rap_context.context.initialized = true;
+ psp->rap_context.context.session_id = cmd->resp.session_id;
mutex_init(&psp->rap_context.mutex);
}
@@ -1846,7 +1846,7 @@ static int psp_rap_unload(struct psp_context *psp)
int ret;
struct psp_gfx_cmd_resp *cmd = acquire_psp_cmd_buf(psp);
- psp_prep_ta_unload_cmd_buf(cmd, psp->rap_context.session_id);
+ psp_prep_ta_unload_cmd_buf(cmd, psp->rap_context.context.session_id);
ret = psp_cmd_submit_buf(psp, NULL, cmd, psp->fence_buf_mc_addr);
@@ -1872,7 +1872,7 @@ static int psp_rap_initialize(struct psp_context *psp)
return 0;
}
- if (!psp->rap_context.rap_initialized) {
+ if (!psp->rap_context.context.initialized) {
ret = psp_rap_init_shared_buf(psp);
if (ret)
return ret;
@@ -1886,11 +1886,11 @@ static int psp_rap_initialize(struct psp_context *psp)
if (ret || status != TA_RAP_STATUS__SUCCESS) {
psp_rap_unload(psp);
- amdgpu_bo_free_kernel(&psp->rap_context.rap_shared_bo,
- &psp->rap_context.rap_shared_mc_addr,
- &psp->rap_context.rap_shared_buf);
+ amdgpu_bo_free_kernel(&psp->rap_context.context.mem_context.shared_bo,
+ &psp->rap_context.context.mem_context.shared_mc_addr,
+ &psp->rap_context.context.mem_context.shared_buf);
- psp->rap_context.rap_initialized = false;
+ psp->rap_context.context.initialized = false;
dev_warn(psp->adev->dev, "RAP TA initialize fail (%d) status %d.\n",
ret, status);
@@ -1905,17 +1905,17 @@ static int psp_rap_terminate(struct psp_context *psp) {
int ret;
- if (!psp->rap_context.rap_initialized)
+ if (!psp->rap_context.context.initialized)
return 0;
ret = psp_rap_unload(psp);
- psp->rap_context.rap_initialized = false;
+ psp->rap_context.context.initialized = false;
/* free rap shared memory */
- amdgpu_bo_free_kernel(&psp->rap_context.rap_shared_bo,
- &psp->rap_context.rap_shared_mc_addr,
- &psp->rap_context.rap_shared_buf);
+ amdgpu_bo_free_kernel(&psp->rap_context.context.mem_context.shared_bo,
+ &psp->rap_context.context.mem_context.shared_mc_addr,
+ &psp->rap_context.context.mem_context.shared_buf);
return ret;
}
@@ -1925,7 +1925,7 @@ int psp_rap_invoke(struct psp_context *psp, uint32_t ta_cmd_id, enum ta_rap_stat
struct ta_rap_shared_memory *rap_cmd;
int ret = 0;
- if (!psp->rap_context.rap_initialized)
+ if (!psp->rap_context.context.initialized)
return 0;
if (ta_cmd_id != TA_CMD_RAP__INITIALIZE && @@ -1935,13 +1935,13 @@ int psp_rap_invoke(struct psp_context *psp, uint32_t ta_cmd_id, enum ta_rap_stat mutex_lock(&psp->rap_context.mutex);
rap_cmd = (struct ta_rap_shared_memory *)
- psp->rap_context.rap_shared_buf;
+ psp->rap_context.context.mem_context.shared_buf;
memset(rap_cmd, 0, sizeof(struct ta_rap_shared_memory));
rap_cmd->cmd_id = ta_cmd_id;
rap_cmd->validation_method_id = METHOD_A;
- ret = psp_ta_invoke(psp, rap_cmd->cmd_id, psp->rap_context.session_id);
+ ret = psp_ta_invoke(psp, rap_cmd->cmd_id,
+psp->rap_context.context.session_id);
if (ret)
goto out_unlock;
@@ -1966,9 +1966,9 @@ static int psp_securedisplay_init_shared_buf(struct psp_context *psp)
*/
ret = amdgpu_bo_create_kernel(psp->adev, PSP_SECUREDISPLAY_SHARED_MEM_SIZE,
PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM,
- &psp->securedisplay_context.securedisplay_shared_bo, - &psp->securedisplay_context.securedisplay_shared_mc_addr, - &psp->securedisplay_context.securedisplay_shared_buf); + &psp->securedisplay_context.context.mem_context.shared_bo, + &psp->securedisplay_context.context.mem_context.shared_mc_addr, + &psp->securedisplay_context.context.mem_context.shared_buf);
return ret;
}
@@ -1984,14 +1984,14 @@ static int psp_securedisplay_load(struct psp_context *psp)
psp_prep_ta_load_cmd_buf(cmd,
psp->fw_pri_mc_addr, psp->securedisplay.size_bytes,
- psp->securedisplay_context.securedisplay_shared_mc_addr,
+ psp->securedisplay_context.context.mem_context.shared_mc_addr,
PSP_SECUREDISPLAY_SHARED_MEM_SIZE);
ret = psp_cmd_submit_buf(psp, NULL, cmd, psp->fence_buf_mc_addr);
if (!ret) {
- psp->securedisplay_context.securedisplay_initialized = true;
- psp->securedisplay_context.session_id = cmd->resp.session_id;
+ psp->securedisplay_context.context.initialized = true;
+ psp->securedisplay_context.context.session_id = cmd->resp.session_id;
mutex_init(&psp->securedisplay_context.mutex);
}
@@ -2005,7 +2005,7 @@ static int psp_securedisplay_unload(struct psp_context *psp)
int ret;
struct psp_gfx_cmd_resp *cmd = acquire_psp_cmd_buf(psp);
- psp_prep_ta_unload_cmd_buf(cmd, psp->securedisplay_context.session_id);
+ psp_prep_ta_unload_cmd_buf(cmd,
+psp->securedisplay_context.context.session_id);
ret = psp_cmd_submit_buf(psp, NULL, cmd, psp->fence_buf_mc_addr);
@@ -2031,7 +2031,7 @@ static int psp_securedisplay_initialize(struct psp_context *psp)
return 0;
}
- if (!psp->securedisplay_context.securedisplay_initialized) {
+ if (!psp->securedisplay_context.context.initialized) {
ret = psp_securedisplay_init_shared_buf(psp);
if (ret)
return ret;
@@ -2048,11 +2048,11 @@ static int psp_securedisplay_initialize(struct psp_context *psp)
if (ret) {
psp_securedisplay_unload(psp);
- amdgpu_bo_free_kernel(&psp->securedisplay_context.securedisplay_shared_bo,
- &psp->securedisplay_context.securedisplay_shared_mc_addr,
- &psp->securedisplay_context.securedisplay_shared_buf);
+ amdgpu_bo_free_kernel(&psp->securedisplay_context.context.mem_context.shared_bo,
+ &psp->securedisplay_context.context.mem_context.shared_mc_addr,
+ &psp->securedisplay_context.context.mem_context.shared_buf);
- psp->securedisplay_context.securedisplay_initialized = false;
+ psp->securedisplay_context.context.initialized = false;
dev_err(psp->adev->dev, "SECUREDISPLAY TA initialize fail.\n"); return -EINVAL;
@@ -2077,19 +2077,19 @@ static int psp_securedisplay_terminate(struct psp_context *psp)
if (amdgpu_sriov_vf(psp->adev))
return 0;
- if (!psp->securedisplay_context.securedisplay_initialized)
+ if (!psp->securedisplay_context.context.initialized)
return 0;
ret = psp_securedisplay_unload(psp);
if (ret)
return ret;
- psp->securedisplay_context.securedisplay_initialized = false;
+ psp->securedisplay_context.context.initialized = false;
/* free securedisplay shared memory */
- amdgpu_bo_free_kernel(&psp->securedisplay_context.securedisplay_shared_bo,
- &psp->securedisplay_context.securedisplay_shared_mc_addr,
- &psp->securedisplay_context.securedisplay_shared_buf);
+ amdgpu_bo_free_kernel(&psp->securedisplay_context.context.mem_context.shared_bo,
+ &psp->securedisplay_context.context.mem_context.shared_mc_addr,
+ &psp->securedisplay_context.context.mem_context.shared_buf);
return ret;
}
@@ -2098,7 +2098,7 @@ int psp_securedisplay_invoke(struct psp_context *psp, uint32_t ta_cmd_id) {
int ret;
- if (!psp->securedisplay_context.securedisplay_initialized)
+ if (!psp->securedisplay_context.context.initialized)
return -EINVAL;
if (ta_cmd_id != TA_SECUREDISPLAY_COMMAND__QUERY_TA && @@ -2107,7 +2107,7 @@ int psp_securedisplay_invoke(struct psp_context *psp, uint32_t ta_cmd_id)
mutex_lock(&psp->securedisplay_context.mutex);
- ret = psp_ta_invoke(psp, ta_cmd_id, psp->securedisplay_context.session_id);
+ ret = psp_ta_invoke(psp, ta_cmd_id,
+psp->securedisplay_context.context.session_id);
mutex_unlock(&psp->securedisplay_context.mutex);
@@ -2727,7 +2727,7 @@ static int psp_suspend(void *handle)
struct psp_context *psp = &adev->psp;
if (adev->gmc.xgmi.num_physical_nodes > 1 &&
- psp->xgmi_context.initialized == 1) {
+ psp->xgmi_context.context.initialized) {
ret = psp_xgmi_terminate(psp);
if (ret) {
DRM_ERROR("Failed to terminate xgmi ta\n"); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
index 2cd84e21592a4c..dc0d6064623433 100644
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +20 -48
89 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_rap.c +1 -1
@@ -76,7 +76,7 @@ static ssize_t amdgpu_rap_debugfs_write(struct file *f, const char __user *buf,dev_info (adev->dev,"RAP L0 validate test success.\n" ); }else { rap_shared_mem = (struct ta_rap_shared_memory *) - adev->psp.rap_context.rap_shared_buf; + adev->psp.rap_context.context.mem_context.shared_buf; rap_cmd_output = &(rap_shared_mem->rap_out_message.output); dev_info(adev->dev, "RAP test failed, the output is:\n"); @@ -119,7 +119,7 @@ void amdgpu_rap_debugfs_init(struct amdgpu_device *adev) #if defined(CONFIG_DEBUG_FS)
struct drm_minor *minor = adev_to_drm(adev)->primary;
- if (!adev->psp.rap_context.rap_initialized)
+ if (!adev->psp.rap_context.context.initialized)
return;
debugfs_create_file("rap_test", S_IWUSR, minor->debugfs_root, diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c
index 123453999093d3..cc7597a15fe977 100644
drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c +3 -2
@@ -80,7 +80,7 @@ void psp_securedisplay_parse_resp_status(struct psp_context *psp, void psp_prep_securedisplay_cmd_buf(struct psp_context *psp, struct securedisplay_cmd **cmd, enum ta_securedisplay_command command_id) { - *cmd = (struct securedisplay_cmd *)psp->securedisplay_context.securedisplay_shared_buf; + *cmd = (struct securedisplay_cmd +*)psp->securedisplay_context.context.mem_context.shared_buf;memset (*cmd,0 ,sizeof (struct securedisplay_cmd )); (*cmd)->status =TA_SECUREDISPLAY_STATUS__GENERIC_FAILURE ; (*cmd)->cmd_id = command_id;
@@ -170,7 +170,7 @@ void amdgpu_securedisplay_debugfs_init(struct amdgpu_device *adev) { #if defined(CONFIG_DEBUG_FS) -if (!adev->psp.securedisplay_context.securedisplay_initialized) +if (!adev->psp.securedisplay_context.context.initialized)return ; debugfs_create_file("securedisplay_test", S_IWUSR, adev_to_drm(adev)->primary->debugfs_root,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c +3 -2
@@ -79,12 +79,12 @@ static uint8_t *psp_get_srm(struct psp_context *psp, uint32_t *srm_version, uintstruct ta_hdcp_shared_memory *hdcp_cmd; -if (!psp->hdcp_context.hdcp_initialized) { +if (!psp->hdcp_context.context.initialized) {DRM_WARN ("Failed to get hdcp srm. HDCP TA is not initialized." );return NULL ; } - hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf; + hdcp_cmd = (struct ta_hdcp_shared_memory +*)psp->hdcp_context.context.mem_context.shared_buf;memset (hdcp_cmd,0 ,sizeof (struct ta_hdcp_shared_memory ));
hdcp_cmd->cmd_id = TA_HDCP_COMMAND__HDCP_GET_SRM; @@ -105,12 +105,12 @@ static int psp_set_srm(struct psp_context *psp, uint8_t *srm, uint32_t srm_size,
struct ta_hdcp_shared_memory *hdcp_cmd;
- if (!psp->hdcp_context.hdcp_initialized) {
+ if (!psp->hdcp_context.context.initialized) {
DRM_WARN("Failed to get hdcp srm. HDCP TA is not initialized."); return -EINVAL;
}
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
memcpy(hdcp_cmd->in_msg.hdcp_set_srm.srm_buf, srm, srm_size); @@ -414,12 +414,12 @@ static bool enable_assr(void *handle, struct dc_link *link) struct ta_dtm_shared_memory *dtm_cmd;
bool res = true;
- if (!psp->dtm_context.dtm_initialized) {
+ if (!psp->dtm_context.context.initialized) {
DRM_INFO("Failed to enable ASSR, DTM TA is not initialized."); return false;
}
- dtm_cmd = (struct ta_dtm_shared_memory *)psp->dtm_context.dtm_shared_buf;
+ dtm_cmd = (struct ta_dtm_shared_memory
+*)psp->dtm_context.context.mem_context.shared_buf;
mutex_lock(&psp->dtm_context.mutex);
memset(dtm_cmd, 0, sizeof(struct ta_dtm_shared_memory)); 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 ade86a042398fb..e9bd84ec027d19 100644
drivers/gpu/drm/amd/display/modules/hdcp/hdcp_psp.c +2 -1
@@ -54,7 +54,7 @@ static enum mod_hdcp_status remove_display_from_topology_v2(get_active_display_at_index (hdcp, index);enum mod_hdcp_status status =MOD_HDCP_STATUS_SUCCESS ; - dtm_cmd = (struct ta_dtm_shared_memory *)psp->dtm_context.dtm_shared_buf; + dtm_cmd = (struct ta_dtm_shared_memory +*)psp->dtm_context.context.mem_context.shared_buf;if (!display || !is_display_active (display))
return MOD_HDCP_STATUS_DISPLAY_NOT_FOUND;
@@ -90,7 +90,7 @@ static enum mod_hdcp_status remove_display_from_topology_v3(
get_active_display_at_index(hdcp, index);
enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
- dtm_cmd = (struct ta_dtm_shared_memory *)psp->dtm_context.dtm_shared_buf;
+ dtm_cmd = (struct ta_dtm_shared_memory
+*)psp->dtm_context.context.mem_context.shared_buf;
if (!display || !is_display_active(display))
return MOD_HDCP_STATUS_DISPLAY_NOT_FOUND;
@@ -128,13 +128,13 @@ static enum mod_hdcp_status add_display_to_topology_v2(
struct mod_hdcp_link *link = &hdcp->connection.link;
enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
- if (!psp->dtm_context.dtm_initialized) {
+ if (!psp->dtm_context.context.initialized) {
DRM_INFO("Failed to add display topology, DTM TA is not initialized."); display->state = MOD_HDCP_DISPLAY_INACTIVE;
return MOD_HDCP_STATUS_FAILURE;
}
- dtm_cmd = (struct ta_dtm_shared_memory *)psp->dtm_context.dtm_shared_buf;
+ dtm_cmd = (struct ta_dtm_shared_memory
+*)psp->dtm_context.context.mem_context.shared_buf;
mutex_lock(&psp->dtm_context.mutex);
memset(dtm_cmd, 0, sizeof(struct ta_dtm_shared_memory)); @@ -175,13 +175,13 @@ static enum mod_hdcp_status add_display_to_topology_v3( struct mod_hdcp_link *link = &hdcp->connection.link;
enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
- if (!psp->dtm_context.dtm_initialized) {
+ if (!psp->dtm_context.context.initialized) {
DRM_INFO("Failed to add display topology, DTM TA is not initialized."); display->state = MOD_HDCP_DISPLAY_INACTIVE;
return MOD_HDCP_STATUS_FAILURE;
}
- dtm_cmd = (struct ta_dtm_shared_memory *)psp->dtm_context.dtm_shared_buf;
+ dtm_cmd = (struct ta_dtm_shared_memory
+*)psp->dtm_context.context.mem_context.shared_buf;
mutex_lock(&psp->dtm_context.mutex);
memset(dtm_cmd, 0, sizeof(struct ta_dtm_shared_memory)); @@ -253,12 +253,12 @@ enum mod_hdcp_status mod_hdcp_hdcp1_create_session(struct mod_hdcp *hdcp) struct ta_hdcp_shared_memory *hdcp_cmd;
enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
- if (!psp->hdcp_context.hdcp_initialized) {
+ if (!psp->hdcp_context.context.initialized) {
DRM_ERROR("Failed to create hdcp session. HDCP TA is not initialized."); return MOD_HDCP_STATUS_FAILURE;
}
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
mutex_lock(&psp->hdcp_context.mutex);
memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory)); @@ -293,7 +293,7 @@ enum mod_hdcp_status mod_hdcp_hdcp1_destroy_session(struct mod_hdcp *hdcp) enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
mutex_lock(&psp->hdcp_context.mutex);
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
hdcp_cmd->in_msg.hdcp1_destroy_session.session_handle = hdcp->auth.id; @@ -325,7 +325,7 @@ enum mod_hdcp_status mod_hdcp_hdcp1_validate_rx(struct mod_hdcp *hdcp) enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
mutex_lock(&psp->hdcp_context.mutex);
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
hdcp_cmd->in_msg.hdcp1_first_part_authentication.session_handle = hdcp->auth.id; @@ -367,7 +367,7 @@ enum mod_hdcp_status mod_hdcp_hdcp1_enable_encryption(struct mod_hdcp *hdcp) enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
mutex_lock(&psp->hdcp_context.mutex);
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
hdcp_cmd->in_msg.hdcp1_enable_encryption.session_handle = hdcp->auth.id; @@ -393,7 +393,7 @@ enum mod_hdcp_status mod_hdcp_hdcp1_validate_ksvlist_vp(struct mod_hdcp *hdcp) enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
mutex_lock(&psp->hdcp_context.mutex);
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
hdcp_cmd->in_msg.hdcp1_second_part_authentication.session_handle = hdcp->auth.id; @@ -436,7 +436,7 @@ enum mod_hdcp_status mod_hdcp_hdcp1_enable_dp_stream_encryption(struct mod_hdcp enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
mutex_lock(&psp->hdcp_context.mutex);
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
for (i = 0; i < MAX_NUM_OF_DISPLAYS; i++) {
@@ -471,7 +471,7 @@ enum mod_hdcp_status mod_hdcp_hdcp1_link_maintenance(struct mod_hdcp *hdcp)
enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
mutex_lock(&psp->hdcp_context.mutex);
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
@@ -498,7 +498,7 @@ enum mod_hdcp_status mod_hdcp_hdcp2_create_session(struct mod_hdcp *hdcp)
enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
- if (!psp->hdcp_context.hdcp_initialized) {
+ if (!psp->hdcp_context.context.initialized) {
DRM_ERROR("Failed to create hdcp session, HDCP TA is not initialized"); return MOD_HDCP_STATUS_FAILURE;
}
@@ -508,7 +508,7 @@ enum mod_hdcp_status mod_hdcp_hdcp2_create_session(struct mod_hdcp *hdcp)
mutex_lock(&psp->hdcp_context.mutex);
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
hdcp_cmd->in_msg.hdcp2_create_session_v2.display_handle = display->index; @@ -545,7 +545,7 @@ enum mod_hdcp_status mod_hdcp_hdcp2_destroy_session(struct mod_hdcp *hdcp) enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
mutex_lock(&psp->hdcp_context.mutex);
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
hdcp_cmd->in_msg.hdcp2_destroy_session.session_handle = hdcp->auth.id; @@ -579,7 +579,7 @@ enum mod_hdcp_status mod_hdcp_hdcp2_prepare_ake_init(struct mod_hdcp *hdcp) enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
mutex_lock(&psp->hdcp_context.mutex);
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
msg_in = &hdcp_cmd->in_msg.hdcp2_prepare_process_authentication_message_v2;
@@ -611,7 +611,7 @@ enum mod_hdcp_status mod_hdcp_hdcp2_validate_ake_cert(struct mod_hdcp *hdcp)
enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
mutex_lock(&psp->hdcp_context.mutex);
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
msg_in = &hdcp_cmd->in_msg.hdcp2_prepare_process_authentication_message_v2;
@@ -671,7 +671,7 @@ enum mod_hdcp_status mod_hdcp_hdcp2_validate_h_prime(struct mod_hdcp *hdcp)
enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
mutex_lock(&psp->hdcp_context.mutex);
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
msg_in = &hdcp_cmd->in_msg.hdcp2_prepare_process_authentication_message_v2;
@@ -717,7 +717,7 @@ enum mod_hdcp_status mod_hdcp_hdcp2_prepare_lc_init(struct mod_hdcp *hdcp)
enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
mutex_lock(&psp->hdcp_context.mutex);
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
msg_in = &hdcp_cmd->in_msg.hdcp2_prepare_process_authentication_message_v2;
@@ -750,7 +750,7 @@ enum mod_hdcp_status mod_hdcp_hdcp2_validate_l_prime(struct mod_hdcp *hdcp)
enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
mutex_lock(&psp->hdcp_context.mutex);
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
msg_in = &hdcp_cmd->in_msg.hdcp2_prepare_process_authentication_message_v2;
@@ -785,7 +785,7 @@ enum mod_hdcp_status mod_hdcp_hdcp2_prepare_eks(struct mod_hdcp *hdcp)
enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
mutex_lock(&psp->hdcp_context.mutex);
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
msg_in = &hdcp_cmd->in_msg.hdcp2_prepare_process_authentication_message_v2;
@@ -833,7 +833,7 @@ enum mod_hdcp_status mod_hdcp_hdcp2_enable_encryption(struct mod_hdcp *hdcp)
mutex_lock(&psp->hdcp_context.mutex);
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
hdcp_cmd->in_msg.hdcp2_set_encryption.session_handle = hdcp->auth.id; @@ -862,7 +862,7 @@ enum mod_hdcp_status mod_hdcp_hdcp2_validate_rx_id_list(struct mod_hdcp *hdcp)
mutex_lock(&psp->hdcp_context.mutex);
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
msg_in = &hdcp_cmd->in_msg.hdcp2_prepare_process_authentication_message_v2;
@@ -914,7 +914,7 @@ enum mod_hdcp_status mod_hdcp_hdcp2_enable_dp_stream_encryption(struct mod_hdcp
enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
mutex_lock(&psp->hdcp_context.mutex);
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
msg_in = &hdcp_cmd->in_msg.hdcp2_prepare_process_authentication_message_v2;
@@ -958,7 +958,7 @@ enum mod_hdcp_status mod_hdcp_hdcp2_prepare_stream_management(struct mod_hdcp *h
enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
mutex_lock(&psp->hdcp_context.mutex);
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
msg_in = &hdcp_cmd->in_msg.hdcp2_prepare_process_authentication_message_v2;
@@ -994,7 +994,7 @@ enum mod_hdcp_status mod_hdcp_hdcp2_validate_stream_ready(struct mod_hdcp *hdcp)
enum mod_hdcp_status status = MOD_HDCP_STATUS_SUCCESS;
mutex_lock(&psp->hdcp_context.mutex);
- hdcp_cmd = (struct ta_hdcp_shared_memory *)psp->hdcp_context.hdcp_shared_buf;
+ hdcp_cmd = (struct ta_hdcp_shared_memory
+*)psp->hdcp_context.context.mem_context.shared_buf;
memset(hdcp_cmd, 0, sizeof(struct ta_hdcp_shared_memory));
msg_in = &hdcp_cmd->in_msg.hdcp2_prepare_process_authentication_message_v2;
--
2.17.1