Skip to content

Commit 9c81200

Browse files
pcolbergalexdeucher
authored andcommitted
Revert duplicate "drm/amdgpu: disable peer-to-peer access for DCC-enabled GC12 VRAM surfaces"
This reverts commit 22a36e6 once, which was merged twice due to an incorrect backmerge resolution. Fixes: ce0478b ("Merge tag 'v6.18-rc6' into drm-next") Signed-off-by: Peter Colberg <pcolberg@redhat.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 38a0f4c)
1 parent 28695ca commit 9c81200

1 file changed

Lines changed: 0 additions & 12 deletions

File tree

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,6 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf,
8383
struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
8484
int r;
8585

86-
/*
87-
* Disable peer-to-peer access for DCC-enabled VRAM surfaces on GFX12+.
88-
* Such buffers cannot be safely accessed over P2P due to device-local
89-
* compression metadata. Fallback to system-memory path instead.
90-
* Device supports GFX12 (GC 12.x or newer)
91-
* BO was created with the AMDGPU_GEM_CREATE_GFX12_DCC flag
92-
*
93-
*/
94-
if (amdgpu_ip_version(adev, GC_HWIP, 0) >= IP_VERSION(12, 0, 0) &&
95-
bo->flags & AMDGPU_GEM_CREATE_GFX12_DCC)
96-
attach->peer2peer = false;
97-
9886
/*
9987
* Disable peer-to-peer access for DCC-enabled VRAM surfaces on GFX12+.
10088
* Such buffers cannot be safely accessed over P2P due to device-local

0 commit comments

Comments
 (0)