diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/0764-drm-amdgpu-psp-add-get_topology_info-function.patch')
-rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/0764-drm-amdgpu-psp-add-get_topology_info-function.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/0764-drm-amdgpu-psp-add-get_topology_info-function.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/0764-drm-amdgpu-psp-add-get_topology_info-function.patch new file mode 100644 index 00000000..dd8e5831 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/0764-drm-amdgpu-psp-add-get_topology_info-function.patch @@ -0,0 +1,68 @@ +From f20424a6a20ad010b485b094e6b4694e41b454e9 Mon Sep 17 00:00:00 2001 +From: Hawking Zhang <Hawking.Zhang@amd.com> +Date: Sat, 29 Sep 2018 22:30:44 +0800 +Subject: [PATCH 0764/2940] drm/amdgpu/psp: add get_topology_info function + +get_topology_info function is used for driver to query topology_info +for current device from xgmi ta + +Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com> +Reviewed-by: Shaoyun Liu <Shaoyun.Liu@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 39 ++++++++++++++++++++++++++ + 1 file changed, 39 insertions(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +index 0f661f93f0f5..a6db4c1cf3f1 100644 +--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +@@ -580,6 +580,45 @@ static int psp_v11_0_mode1_reset(struct psp_context *psp) + static int psp_v11_0_xgmi_get_topology_info(struct psp_context *psp, + int number_devices, struct psp_xgmi_topology_info *topology) + { ++ struct ta_xgmi_shared_memory *xgmi_cmd; ++ struct ta_xgmi_cmd_get_topology_info_input *topology_info_input; ++ struct ta_xgmi_cmd_get_topology_info_output *topology_info_output; ++ int i; ++ int ret; ++ ++ 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; ++ memset(xgmi_cmd, 0, sizeof(struct ta_xgmi_shared_memory)); ++ ++ /* Fill in the shared memory with topology information as input */ ++ topology_info_input = &xgmi_cmd->xgmi_in_message.get_topology_info; ++ xgmi_cmd->cmd_id = TA_COMMAND_XGMI__GET_GET_TOPOLOGY_INFO; ++ topology_info_input->num_nodes = number_devices; ++ ++ for (i = 0; i < topology_info_input->num_nodes; i++) { ++ topology_info_input->nodes[i].node_id = topology->nodes[i].node_id; ++ topology_info_input->nodes[i].num_hops = topology->nodes[i].num_hops; ++ topology_info_input->nodes[i].is_sharing_enabled = topology->nodes[i].is_sharing_enabled; ++ topology_info_input->nodes[i].sdma_engine = topology->nodes[i].sdma_engine; ++ } ++ ++ /* Invoke xgmi ta to get the topology information */ ++ ret = psp_xgmi_invoke(psp, TA_COMMAND_XGMI__GET_GET_TOPOLOGY_INFO); ++ if (ret) ++ return ret; ++ ++ /* Read the output topology information from the shared memory */ ++ topology_info_output = &xgmi_cmd->xgmi_out_message.get_topology_info; ++ topology->num_nodes = xgmi_cmd->xgmi_out_message.get_topology_info.num_nodes; ++ for (i = 0; i < topology->num_nodes; i++) { ++ topology->nodes[i].node_id = topology_info_output->nodes[i].node_id; ++ topology->nodes[i].num_hops = topology_info_output->nodes[i].num_hops; ++ topology->nodes[i].is_sharing_enabled = topology_info_output->nodes[i].is_sharing_enabled; ++ topology->nodes[i].sdma_engine = topology_info_output->nodes[i].sdma_engine; ++ } ++ + return 0; + } + +-- +2.17.1 + |