diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/0891-drm-amdgpu-add-a-xgmi-supported-flag.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/0891-drm-amdgpu-add-a-xgmi-supported-flag.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/0891-drm-amdgpu-add-a-xgmi-supported-flag.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/0891-drm-amdgpu-add-a-xgmi-supported-flag.patch new file mode 100644 index 00000000..9dbd6fee --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/0891-drm-amdgpu-add-a-xgmi-supported-flag.patch @@ -0,0 +1,75 @@ +From 76a17c8ade9bc3ca18aeb9d3cffd401363db8dbd Mon Sep 17 00:00:00 2001 +From: Alex Deucher <alexander.deucher@amd.com> +Date: Fri, 30 Nov 2018 15:29:43 -0500 +Subject: [PATCH 0891/2940] 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> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 4 ++-- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +++ + 4 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h +index 1627cbc93b92..59b7c34a9f92 100644 +--- 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 fb37e69f1bba..f8c86d0593dd 100644 +--- 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 fe1eec6c349c..9c3e3dfec61a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +@@ -990,7 +990,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 8120f0fb0e8d..864e7db0c4a1 100644 +--- a/drivers/gpu/drm/amd/amdgpu/soc15.c ++++ b/drivers/gpu/drm/amd/amdgpu/soc15.c +@@ -507,6 +507,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) +-- +2.17.1 + |