FAILED: patch "[PATCH] drm/amdgpu: once more fix the call oder in amdgpu_ttm_move()" failed to apply to 6.1-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x ffda7081489b2c14650798b3b46fb76292f163a3
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024081217-important-apprehend-0fa9@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
ffda7081489b ("drm/amdgpu: once more fix the call oder in amdgpu_ttm_move() v2") 94aeb4117343 ("drm/amdgpu: fix ftrace event amdgpu_bo_move always move on same heap")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From ffda7081489b2c14650798b3b46fb76292f163a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <[email protected]>
Date: Thu, 21 Mar 2024 11:32:02 +0100
Subject: [PATCH] drm/amdgpu: once more fix the call oder in amdgpu_ttm_move()
v2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts drm/amdgpu: fix ftrace event amdgpu_bo_move always move on same heap. The basic problem here is that after the move the old location is simply not available any more.
Some fixes were suggested, but essentially we should call the move notification before actually moving things because only this way we have the correct order for DMA-buf and VM move notifications as well.
Also rework the statistic handling so that we don't update the eviction counter before the move.
v2: add missing NULL check
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +9 -5
@@ -1255,14 +1255,18 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer,* amdgpu_bo_move_notify - notification about a memory move * @bo: pointer to a buffer object * @evict: if this move is evicting the buffer from the graphics address space +* @new_mem: new resource for backing the BO * * Marks the corresponding &amdgpu_bo buffer object as invalid, also performs * bookkeeping. * TTM driver callback which is called when ttm moves a buffer. */ -void amdgpu_bo_move_notify (struct ttm_buffer_object *bo,bool evict) +void amdgpu_bo_move_notify (struct ttm_buffer_object *bo, +bool evict, +struct ttm_resource *new_mem) {struct amdgpu_device *adev =amdgpu_ttm_adev (bo->bdev); +struct ttm_resource *old_mem = bo->resource;struct amdgpu_bo *abo;if (!amdgpu_bo_is_amdgpu_bo (bo))
@@ -1274,12 +1278,12 @@ void amdgpu_bo_move_notify(struct ttm_buffer_object *bo, bool evict)amdgpu_bo_kunmap (abo);if (abo->tbo.base.dma_buf && !abo->tbo.base.import_attach && - bo->resource->mem_type !=TTM_PL_SYSTEM ) + old_mem && old_mem->mem_type !=TTM_PL_SYSTEM )dma_buf_move_notify (abo->tbo.base.dma_buf); -/* remember the eviction */ -if (evict) -atomic64_inc (&adev->num_evictions); +/* move_notify is called before move happens */ +trace_amdgpu_bo_move (abo, new_mem ? new_mem->mem_type :-1 , + old_mem ? old_mem->mem_type :-1 ); } void amdgpu_bo_get_memory(struct amdgpu_bo *bo,
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +3 -1
@@ -328,7 +328,9 @@ int amdgpu_bo_set_metadata (struct amdgpu_bo *bo, void *metadata,int amdgpu_bo_get_metadata (struct amdgpu_bo *bo,void *buffer,size_t buffer_size,uint32_t *metadata_size,uint64_t *flags); -void amdgpu_bo_move_notify (struct ttm_buffer_object *bo,bool evict); +void amdgpu_bo_move_notify (struct ttm_buffer_object *bo, +bool evict, +struct ttm_resource *new_mem);void amdgpu_bo_release_notify (struct ttm_buffer_object *bo);vm_fault_t amdgpu_bo_fault_reserve_notify (struct ttm_buffer_object *bo); void amdgpu_bo_fence(struct amdgpu_bo *bo, struct dma_fence *fence,
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +28 -24
100 lines not on this page · raw message