| From alexander.deucher@amd.com Sun Sep 7 15:13:02 2025 |
| From: Alex Deucher <alexander.deucher@amd.com> |
| Date: Fri, 29 Aug 2025 15:36:52 -0400 |
| Subject: Revert "drm/amdgpu: Avoid extra evict-restore process." |
| To: <stable@vger.kernel.org>, <gregkh@linuxfoundation.org>, <sashal@kernel.org> |
| Cc: Alex Deucher <alexander.deucher@amd.com> |
| Message-ID: <20250829193652.1925084-1-alexander.deucher@amd.com> |
| |
| From: Alex Deucher <alexander.deucher@amd.com> |
| |
| This reverts commit a3201e3b7cf10bcd3d7eef4859d275eb6d98e12a which is |
| commit 1f02f2044bda1db1fd995bc35961ab075fa7b5a2 upstream. |
| |
| This commit introduced a regression, however the fix for the regression: |
| aa5fc4362fac ("drm/amdgpu: fix task hang from failed job submission |
| during process kill") depends on things not yet present in 6.12.y and |
| older kernels. Since this commit is more of an optimization, just |
| revert it for 6.12.y and older stable kernels. |
| |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Cc: stable@vger.kernel.org # 6.1.x - 6.12.x |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c |
| @@ -2125,11 +2125,13 @@ void amdgpu_vm_adjust_size(struct amdgpu |
| */ |
| long amdgpu_vm_wait_idle(struct amdgpu_vm *vm, long timeout) |
| { |
| - timeout = drm_sched_entity_flush(&vm->immediate, timeout); |
| + timeout = dma_resv_wait_timeout(vm->root.bo->tbo.base.resv, |
| + DMA_RESV_USAGE_BOOKKEEP, |
| + true, timeout); |
| if (timeout <= 0) |
| return timeout; |
| |
| - return drm_sched_entity_flush(&vm->delayed, timeout); |
| + return dma_fence_wait_timeout(vm->last_unlocked, true, timeout); |
| } |
| |
| /** |
