Commit bb66ecbf authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Use simplified API for p2p dist calc 



Use the simpified API that calculates distance between two devices.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarGuchun Chen <guchun.chen@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d0fa84f1

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+3 −3
Original line number Diff line number Diff line
@@ -5576,9 +5576,9 @@ bool amdgpu_device_is_peer_accessible(struct amdgpu_device *adev, 
		~*peer_adev->dev->dma_mask : ~((1ULL << 32) - 1);

	resource_size_t aper_limit =

		adev->gmc.aper_base + adev->gmc.aper_size - 1;

	bool p2p_access = !adev->gmc.xgmi.connected_to_cpu &&

			  !(pci_p2pdma_distance_many(adev->pdev,

					&peer_adev->dev, 1, false) < 0);

	bool p2p_access =

		!adev->gmc.xgmi.connected_to_cpu &&

		!(pci_p2pdma_distance(adev->pdev, peer_adev->dev, false) < 0);



	return pcie_p2p && p2p_access && (adev->gmc.visible_vram_size &&

		adev->gmc.real_vram_size == adev->gmc.visible_vram_size &&

drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf, 
	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);

	int r;



	if (pci_p2pdma_distance_many(adev->pdev, &attach->dev, 1, false) < 0)

	if (pci_p2pdma_distance(adev->pdev, attach->dev, false) < 0)

		attach->peer2peer = false;



	r = pm_runtime_get_sync(adev_to_drm(adev)->dev);