[PATCH 4.20 159/183] drm/amdgpu: disable bulk moves for now

From: Greg Kroah-Hartman
Date: Mon Feb 25 2019 - 16:36:06 EST


4.20-stable review patch. If anyone has any objections, please let me know.

------------------

From: Christian KÃnig <ckoenig.leichtzumerken@xxxxxxxxx>

commit a213c2c7e235cfc0e0a161a558f7fdf2fb3a624a upstream.

The changes to fix those are two invasive for backporting.

Just disable the feature in 4.20 and 5.0.

Acked-by: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Christian KÃnig <christian.koenig@xxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx> [4.20+]
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 ++
1 file changed, 2 insertions(+)

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -637,12 +637,14 @@ void amdgpu_vm_move_to_lru_tail(struct a
struct ttm_bo_global *glob = adev->mman.bdev.glob;
struct amdgpu_vm_bo_base *bo_base;

+#if 0
if (vm->bulk_moveable) {
spin_lock(&glob->lru_lock);
ttm_bo_bulk_move_lru_tail(&vm->lru_bulk_move);
spin_unlock(&glob->lru_lock);
return;
}
+#endif

memset(&vm->lru_bulk_move, 0, sizeof(vm->lru_bulk_move));