diff options
author | Hawking Zhang <Hawking.Zhang@amd.com> | 2018-09-28 09:50:37 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-11-06 14:02:43 -0500 |
commit | dd3c45d306220b7f3e40fd1457eaf480ab7d1b26 (patch) | |
tree | ff40b8604ee6875283e5e726fd3a5d4960aa641b /drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | |
parent | 3e2e2ab55499f77cbd57ee91e250c085d252a979 (diff) |
drm/amdgpu/psp: add get_node_id function
get_node_id function is used for driver to get node_id
for current device from xgmi ta
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Shaoyun Liu <Shaoyun.Liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h index 000e12b437f0..28700a80cddd 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | |||
@@ -82,7 +82,7 @@ struct psp_funcs | |||
82 | enum AMDGPU_UCODE_ID ucode_type); | 82 | enum AMDGPU_UCODE_ID ucode_type); |
83 | bool (*smu_reload_quirk)(struct psp_context *psp); | 83 | bool (*smu_reload_quirk)(struct psp_context *psp); |
84 | int (*mode1_reset)(struct psp_context *psp); | 84 | int (*mode1_reset)(struct psp_context *psp); |
85 | uint64_t (*xgmi_get_device_id)(struct psp_context *psp); | 85 | uint64_t (*xgmi_get_node_id)(struct psp_context *psp); |
86 | uint64_t (*xgmi_get_hive_id)(struct psp_context *psp); | 86 | uint64_t (*xgmi_get_hive_id)(struct psp_context *psp); |
87 | int (*xgmi_get_topology_info)(struct psp_context *psp, int number_devices, | 87 | int (*xgmi_get_topology_info)(struct psp_context *psp, int number_devices, |
88 | struct psp_xgmi_topology_info *topology); | 88 | struct psp_xgmi_topology_info *topology); |
@@ -163,7 +163,7 @@ struct amdgpu_psp_funcs { | |||
163 | 163 | ||
164 | struct psp_xgmi_topology_info { | 164 | struct psp_xgmi_topology_info { |
165 | /* Generated by PSP to identify the GPU instance within xgmi connection */ | 165 | /* Generated by PSP to identify the GPU instance within xgmi connection */ |
166 | uint64_t device_id; | 166 | uint64_t node_id; |
167 | /* | 167 | /* |
168 | * If all bits set to 0 , driver indicates it wants to retrieve the xgmi | 168 | * If all bits set to 0 , driver indicates it wants to retrieve the xgmi |
169 | * connection vector topology, but not access enable the connections | 169 | * connection vector topology, but not access enable the connections |
@@ -197,8 +197,8 @@ struct psp_xgmi_topology_info { | |||
197 | ((psp)->funcs->smu_reload_quirk ? (psp)->funcs->smu_reload_quirk((psp)) : false) | 197 | ((psp)->funcs->smu_reload_quirk ? (psp)->funcs->smu_reload_quirk((psp)) : false) |
198 | #define psp_mode1_reset(psp) \ | 198 | #define psp_mode1_reset(psp) \ |
199 | ((psp)->funcs->mode1_reset ? (psp)->funcs->mode1_reset((psp)) : false) | 199 | ((psp)->funcs->mode1_reset ? (psp)->funcs->mode1_reset((psp)) : false) |
200 | #define psp_xgmi_get_device_id(psp) \ | 200 | #define psp_xgmi_get_node_id(psp) \ |
201 | ((psp)->funcs->xgmi_get_device_id ? (psp)->funcs->xgmi_get_device_id((psp)) : 0) | 201 | ((psp)->funcs->xgmi_get_node_id ? (psp)->funcs->xgmi_get_node_id((psp)) : 0) |
202 | #define psp_xgmi_get_hive_id(psp) \ | 202 | #define psp_xgmi_get_hive_id(psp) \ |
203 | ((psp)->funcs->xgmi_get_hive_id ? (psp)->funcs->xgmi_get_hive_id((psp)) : 0) | 203 | ((psp)->funcs->xgmi_get_hive_id ? (psp)->funcs->xgmi_get_hive_id((psp)) : 0) |
204 | #define psp_xgmi_get_topology_info(psp, num_device, topology) \ | 204 | #define psp_xgmi_get_topology_info(psp, num_device, topology) \ |