diff options
| author | Maxime Ripard <mripard@kernel.org> | 2025-06-03 15:07:39 +0200 |
|---|---|---|
| committer | Maxime Ripard <mripard@kernel.org> | 2025-06-03 15:07:39 +0200 |
| commit | 7b1166dee847d5018c1f3cc781218e806078f752 (patch) | |
| tree | 84a2e30eade0212b89cc05063fb8e9a5793e9d7a /drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | |
| parent | drm/udl: use DRM_GEM_SHMEM_DRIVER_OPS_NO_MAP_SGT (diff) | |
| parent | drm/nouveau/tegra: Fix error pointer vs NULL return in nvkm_device_tegra_reso... (diff) | |
| download | linux-7b1166dee847d5018c1f3cc781218e806078f752.tar.gz linux-7b1166dee847d5018c1f3cc781218e806078f752.zip | |
Merge drm-next-2025-05-28 into drm-misc-next
Christian needs a recent drm-next branch to merge fence patches.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c index 5576ed0b508f..d6ae9974c952 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c @@ -249,9 +249,8 @@ int amdgpu_sync_resv(struct amdgpu_device *adev, struct amdgpu_sync *sync, if (resv == NULL) return -EINVAL; - - /* TODO: Use DMA_RESV_USAGE_READ here */ - dma_resv_for_each_fence(&cursor, resv, DMA_RESV_USAGE_BOOKKEEP, f) { + /* Implicitly sync only to KERNEL, WRITE and READ */ + dma_resv_for_each_fence(&cursor, resv, DMA_RESV_USAGE_READ, f) { dma_fence_chain_for_each(f, f) { struct dma_fence *tmp = dma_fence_chain_contained(f); |