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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
index 8c57924c075fa5e8a7dc69d6b6c06384f9f6e96d..81e6070d255b513301dca839320d1410f2baa2ed 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
@@ -99,6 +99,7 @@ struct amdgpu_xgmi {
        unsigned num_physical_nodes;
        /* gpu list in the same hive */
        struct list_head head;
+       bool supported;
 };
 
 struct amdgpu_gmc {

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
index fb37e69f1bba3eb6e07efc8f40af4a947ae36734..f8c86d0593dd6845f8c49e6289bdc2fbf21d9a72 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
@@ -94,9 +94,9 @@ int amdgpu_xgmi_add_device(struct amdgpu_device *adev)
 
        int count = 0, ret = -EINVAL;
 
-       if ((adev->asic_type < CHIP_VEGA20) ||
-               (adev->flags & AMD_IS_APU) )
+       if (!adev->gmc.xgmi.supported)
                return 0;
+
        adev->gmc.xgmi.node_id = psp_xgmi_get_node_id(&adev->psp);
        adev->gmc.xgmi.hive_id = psp_xgmi_get_hive_id(&adev->psp);
 

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 3a4e5d8d5162dd0e4d404ad6cb9bcba36ae68733..ed3145b2a596fa575503ebc4c35ea598dec601bf 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -934,7 +934,7 @@ static int gmc_v9_0_sw_init(void *handle)
        }
        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);
                if (r)
                        return r;

diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index b318950ebbaaaa3e65c200a73798ab585c3675cb..f2cd87dc365a3215bc6b91ec48d0bf1a0075a83d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -500,6 +500,9 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
                return -EINVAL;
        }
 
+       if (adev->asic_type == CHIP_VEGA20)
+               adev->gmc.xgmi.supported = true;
+
        if (adev->flags & AMD_IS_APU)
                adev->nbio_funcs = &nbio_v7_0_funcs;
        else if (adev->asic_type == CHIP_VEGA20)