drm/amdgpu: Add peer-to-peer support among PCIe connected AMD GPUs
Subsystems (3)
PATCH 2/3 drm/amdgpu: Add peer-to-peer support among PCIe connected AMD GPUs
Add support for peer-to-peer communication among AMD GPUs over PCIe bus. Support REQUIRES enablement of config HSA_AMD_P2P.
Signed-off-by Ramesh Errabolu <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 300 ++++++++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 33 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 8 + 4 files changed, 280 insertions(+), 62 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +1 -0
@@ -48,6 +48,7 @@ enum kfd_mem_attachment_type {KFD_MEM_ATT_SHARED ,/* Share kgd_mem->bo or another attachment's */ KFD_MEM_ATT_USERPTR ,/* SG bo to DMA map pages from a userptr bo */ KFD_MEM_ATT_DMABUF ,/* DMAbuf to DMA map TTM BOs */ +KFD_MEM_ATT_SG /* Tag to DMA map SG BOs */ }; struct kfd_mem_attachment {
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +238 -62
384 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +33 -0
@@ -32,6 +32,7 @@#include <linux/slab.h> #include <linux/iommu.h> #include <linux/pci.h> +#include <linux/pci-p2pdma.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_probe_helper.h>
@@ -127,6 +128,8 @@ const char *amdgpu_asic_name[] = { "LAST", }; +extern bool pcie_p2p; +/** * DOC: pcie_replay_count *
@@ -5434,6 +5437,36 @@ static void amdgpu_device_get_pcie_info(struct amdgpu_device *adev) } } +/** +* amdgpu_device_is_peer_accessible - Check peer access through PCIe BAR +* +* @adev: amdgpu_device pointer +* @peer_adev: amdgpu_device pointer for peer device trying to access @adev +* +* Return true if @peer_adev can access (DMA) @adev through the PCIe +* BAR, i.e. @adev is "large BAR" and the BAR matches the DMA mask of +* @peer_adev. +*/ +bool amdgpu_device_is_peer_accessible (struct amdgpu_device *adev, +struct amdgpu_device *peer_adev) +{ +#ifdef CONFIG_HSA_AMD_P2P +bool p2p_access = false; +uint64_t address_mask = peer_adev->dev->dma_mask ? + ~*peer_adev->dev->dma_mask : ~((1ULL <<32 ) -1 ); +resource_size_t aper_limit = + adev->gmc.aper_base + adev->gmc.aper_size -1 ; + p2p_access = !(pci_p2pdma_distance_many (adev->pdev, &peer_adev->dev,1 , true) <0 ); + +return pcie_p2p && p2p_access && (adev->gmc.visible_vram_size && + adev->gmc.real_vram_size == adev->gmc.visible_vram_size && + !(adev->gmc.aper_base & address_mask || + aper_limit & address_mask)); +#else +return false; +#endif +} +int amdgpu_device_baco_enter (struct drm_device *dev) {struct amdgpu_device *adev =drm_to_adev (dev);
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +8 -0
@@ -802,6 +802,14 @@ MODULE_PARM_DESC(no_queue_eviction_on_vm_fault, "No queue eviction on VM fault (module_param_named (no_queue_eviction_on_vm_fault, amdgpu_no_queue_eviction_on_vm_fault, int,0444 );#endif +/** +* DOC: pcie_p2p (bool) +* Enable PCIe P2P (requires large-BAR). Default value: true (on) +*/ +bool pcie_p2p = true; +module_param (pcie_p2p, bool,0444 ); +MODULE_PARM_DESC (pcie_p2p,"Enable PCIe P2P (requires large-BAR). (N = off, Y = on(default))" ); +/** * DOC: dcfeaturemask (uint) * Override display features enabled. See enum DC_FEATURE_MASK in drivers/gpu/drm/amd/include/amd_shared.h.
Signature · 1 line
2.35.1