[PATCH 05/13] drm/amdgpu/gmc9: populate xgmi info for vega20

[PATCH 05/13] drm/amdgpu/gmc9: populate xgmi info for vega20

[shaoyunl]

From: Alex Deucher <alexander.deucher@amd.com>

Call the new gfxhub 1.1 function to get the xgmi info.

Acked-by: Huang Rui <ray.huang@amd.com>
Acked-by: Slava Abramov <slava.abramov@amd.com>
Reviewed-by :Shaoyun liu <Shaoyun.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 0da89ba..b1c8489 100644
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -43,6 +43,7 @@
 
 #include "gfxhub_v1_0.h"
 #include "mmhub_v1_0.h"
+#include "gfxhub_v1_1.h"
 
 #include "ivsrcid/vmc/irqsrcs_vmc_1_0.h"
 
@@ -991,6 +992,12 @@ 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) {
+		r = gfxhub_v1_1_get_xgmi_info(adev);
+		if (r)
+			return r;
+	}
+
 	r = gmc_v9_0_mc_init(adev);
 	if (r)
 		return r;
-- 
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH 05/13] drm/amdgpu/gmc9: populate xgmi info for vega20

[Christian König]

Am 05.09.2018 um 17:30 schrieb shaoyunl:
> From: Alex Deucher <alexander.deucher@amd.com>
>
> Call the new gfxhub 1.1 function to get the xgmi info.
>
> Acked-by: Huang Rui <ray.huang@amd.com>
> Acked-by: Slava Abramov <slava.abramov@amd.com>
> Reviewed-by :Shaoyun liu <Shaoyun.liu@amd.com>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Reviewed-by: Christian König <christian.koenig@amd.com>, could probably 
be squashed into patch #3.

> ---
>   drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 7 +++++++
>   1 file changed, 7 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> index 0da89ba..b1c8489 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> @@ -43,6 +43,7 @@
>   
>   #include "gfxhub_v1_0.h"
>   #include "mmhub_v1_0.h"
> +#include "gfxhub_v1_1.h"
>   
>   #include "ivsrcid/vmc/irqsrcs_vmc_1_0.h"
>   
> @@ -991,6 +992,12 @@ 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) {
> +		r = gfxhub_v1_1_get_xgmi_info(adev);
> +		if (r)
> +			return r;
> +	}
> +
>   	r = gmc_v9_0_mc_init(adev);
>   	if (r)
>   		return r;

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx