Commit 38a0f4cf authored by Peter Colberg's avatar Peter Colberg Committed by Alex Deucher
Browse files

Revert duplicate "drm/amdgpu: disable peer-to-peer access for DCC-enabled GC12 VRAM surfaces" 



This reverts commit 22a36e66 once,
which was merged twice due to an incorrect backmerge resolution.

Fixes: ce0478b0 ("Merge tag 'v6.18-rc6' into drm-next")
Signed-off-by: default avatarPeter Colberg <pcolberg@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6a23e7b4

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

+0 −12
Original line number Diff line number Diff line
@@ -84,18 +84,6 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf, 
	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);

	int r;



	/*

	 * Disable peer-to-peer access for DCC-enabled VRAM surfaces on GFX12+.

	 * Such buffers cannot be safely accessed over P2P due to device-local

	 * compression metadata. Fallback to system-memory path instead.

	 * Device supports GFX12 (GC 12.x or newer)

	 * BO was created with the AMDGPU_GEM_CREATE_GFX12_DCC flag

	 *

	 */

	if (amdgpu_ip_version(adev, GC_HWIP, 0) >= IP_VERSION(12, 0, 0) &&

	    bo->flags & AMDGPU_GEM_CREATE_GFX12_DCC)

		attach->peer2peer = false;



	/*

	 * Disable peer-to-peer access for DCC-enabled VRAM surfaces on GFX12+.

	 * Such buffers cannot be safely accessed over P2P due to device-local