drm/amdgpu: define address map for host xgmi link (v3)

This applies to AMD Accelerated Processing Platforms that support host
gpu interconnect throguh a special link (xgmi). Aldebaran systems will
support this special feature for utilizing the benefits of host-gpu
cache coherence. This change outlines the basic framework for mapping
the GPU VRAM (HBM) to system address space making it accesible to the
host but managed by the amdgpu driver since this region is marked as
reserved memory in host address space by the underlying system firmware.

v2: switch to smuio callback function to check the type
of host-gpu interface (Hawking)
v3: use hub callbacks rather than direct function calls (Alex)

Reviewed-by: Oak Zeng <oak.zeng@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Rajneesh Bhardwaj <rajneesh.bhardwaj@amd.com>
Signed-off-by: Hawking Zhang <Hawking.Zhang@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 aa0c83776ce0c977d49db8bcd84f3b1ec0cdc800..11c6977c0b350ed1826e0f9cf9c1084c741af6ba 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
@@ -149,6 +149,7 @@ struct amdgpu_xgmi {
        struct list_head head;
        bool supported;
        struct ras_common_if *ras_if;
+       bool connected_to_cpu;
 };
 
 struct amdgpu_gmc {

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index ff4a2e0a1ad61db5f113beb76e511b8dd814d6e0..1f8732beedd3c07f7c75384a127735d933753d69 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -1146,6 +1146,16 @@ static int gmc_v9_0_early_init(void *handle)
        gmc_v9_0_set_mmhub_funcs(adev);
        gmc_v9_0_set_gfxhub_funcs(adev);
 
+       if (adev->asic_type == CHIP_VEGA20 ||
+           adev->asic_type == CHIP_ARCTURUS)
+               adev->gmc.xgmi.supported = true;
+
+       if (adev->asic_type == CHIP_ALDEBARAN) {
+               adev->gmc.xgmi.supported = true;
+               adev->gmc.xgmi.connected_to_cpu =
+                       adev->smuio.funcs->is_host_gpu_xgmi_supported(adev);
+        }
+
        adev->gmc.shared_aperture_start = 0x2000000000000000ULL;
        adev->gmc.shared_aperture_end =
                adev->gmc.shared_aperture_start + (4ULL << 30) - 1;
@@ -1234,10 +1244,34 @@ static int gmc_v9_0_mc_init(struct amdgpu_device *adev)
        adev->gmc.aper_size = pci_resource_len(adev->pdev, 0);
 
 #ifdef CONFIG_X86_64
+       /*
+        * AMD Accelerated Processing Platform (APP) supporting GPU-HOST xgmi
+        * interface can use VRAM through here as it appears system reserved
+        * memory in host address space.
+        *
+        * For APUs, VRAM is just the stolen system memory and can be accessed
+        * directly.
+        *
+        * Otherwise, use the legacy Host Data Path (HDP) through PCIe BAR.
+        */
+
+       /* check whether both host-gpu and gpu-gpu xgmi links exist */
+       if (adev->gmc.xgmi.supported && adev->gmc.xgmi.connected_to_cpu &&
+           adev->asic_type == CHIP_ALDEBARAN) {
+
+               adev->gmc.aper_base = adev->gfxhub.funcs->get_mc_fb_offset(adev) +
+                       adev->gmc.xgmi.node_id *
+                       adev->gmc.xgmi.node_segment_size;
+
+               adev->gmc.aper_size = adev->gmc.real_vram_size;
+
+       }
+
        if (adev->flags & AMD_IS_APU) {
                adev->gmc.aper_base = adev->gfxhub.funcs->get_mc_fb_offset(adev);
                adev->gmc.aper_size = adev->gmc.real_vram_size;
        }
+
 #endif
        /* In case the PCI BAR is larger than the actual amount of vram */
        adev->gmc.visible_vram_size = adev->gmc.aper_size;

diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index cdbea673a58eab7d79e7732722a19ab4f3366460..96debb9713a44f1077732bab9ab5dc407ee5eb3c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -917,11 +917,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
        if (!amdgpu_sriov_vf(adev))
                soc15_reg_base_init(adev);
 
-       if (adev->asic_type == CHIP_VEGA20 ||
-           adev->asic_type == CHIP_ARCTURUS ||
-           adev->asic_type == CHIP_ALDEBARAN)
-               adev->gmc.xgmi.supported = true;
-
        if (adev->flags & AMD_IS_APU) {
                adev->nbio.funcs = &nbio_v7_0_funcs;
                adev->nbio.hdp_flush_reg = &nbio_v7_0_hdp_flush_reg;