mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
drm/amdgpu: add a xgmi supported flag
Use this to track whether an asic supports xgmi rather than checking the asic type everywhere. Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
e210167522
commit
47622ba033
4 changed files with 7 additions and 3 deletions
|
@ -99,6 +99,7 @@ struct amdgpu_xgmi {
|
||||||
unsigned num_physical_nodes;
|
unsigned num_physical_nodes;
|
||||||
/* gpu list in the same hive */
|
/* gpu list in the same hive */
|
||||||
struct list_head head;
|
struct list_head head;
|
||||||
|
bool supported;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct amdgpu_gmc {
|
struct amdgpu_gmc {
|
||||||
|
|
|
@ -94,9 +94,9 @@ int amdgpu_xgmi_add_device(struct amdgpu_device *adev)
|
||||||
|
|
||||||
int count = 0, ret = -EINVAL;
|
int count = 0, ret = -EINVAL;
|
||||||
|
|
||||||
if ((adev->asic_type < CHIP_VEGA20) ||
|
if (!adev->gmc.xgmi.supported)
|
||||||
(adev->flags & AMD_IS_APU) )
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
adev->gmc.xgmi.node_id = psp_xgmi_get_node_id(&adev->psp);
|
adev->gmc.xgmi.node_id = psp_xgmi_get_node_id(&adev->psp);
|
||||||
adev->gmc.xgmi.hive_id = psp_xgmi_get_hive_id(&adev->psp);
|
adev->gmc.xgmi.hive_id = psp_xgmi_get_hive_id(&adev->psp);
|
||||||
|
|
||||||
|
|
|
@ -934,7 +934,7 @@ static int gmc_v9_0_sw_init(void *handle)
|
||||||
}
|
}
|
||||||
adev->need_swiotlb = drm_get_max_iomem() > ((u64)1 << dma_bits);
|
adev->need_swiotlb = drm_get_max_iomem() > ((u64)1 << dma_bits);
|
||||||
|
|
||||||
if (adev->asic_type == CHIP_VEGA20) {
|
if (adev->gmc.xgmi.supported) {
|
||||||
r = gfxhub_v1_1_get_xgmi_info(adev);
|
r = gfxhub_v1_1_get_xgmi_info(adev);
|
||||||
if (r)
|
if (r)
|
||||||
return r;
|
return r;
|
||||||
|
|
|
@ -500,6 +500,9 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (adev->asic_type == CHIP_VEGA20)
|
||||||
|
adev->gmc.xgmi.supported = true;
|
||||||
|
|
||||||
if (adev->flags & AMD_IS_APU)
|
if (adev->flags & AMD_IS_APU)
|
||||||
adev->nbio_funcs = &nbio_v7_0_funcs;
|
adev->nbio_funcs = &nbio_v7_0_funcs;
|
||||||
else if (adev->asic_type == CHIP_VEGA20)
|
else if (adev->asic_type == CHIP_VEGA20)
|
||||||
|
|
Loading…
Reference in a new issue