Hi all,

Today's linux-next merge of the drm tree got a conflict in:

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

between commit:

  1c824497d8acd ("drm/amdgpu: fix calling VM invalidation in amdgpu_hmm_invalidate_gfx")

from the drm-fixes tree and commit:

  4cdbba5a16aaf ("drm/amdgpu: restructure VM state machine v4")

from the drm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index c9f88ecce1a75,a99d01f9dc750..0000000000000
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@@ -1629,9 -1598,8 +1598,9 @@@ int amdgpu_vm_handle_moved(struct amdgp
  			   struct amdgpu_vm *vm,
  			   struct ww_acquire_ctx *ticket)
  {
- 	struct amdgpu_bo_va *bo_va;
+ 	struct amdgpu_bo_va *bo_va, *tmp;
  	struct dma_resv *resv;
 +	struct amdgpu_bo *bo;
  	bool clear, unlock;
  	int r;
  
@@@ -1645,19 -1609,17 +1610,18 @@@
  		r = amdgpu_vm_bo_update(adev, bo_va, false);
  		if (r)
  			return r;
- 		spin_lock(&vm->status_lock);
  	}
  
- 	while (!list_empty(&vm->invalidated)) {
- 		bo_va = list_first_entry(&vm->invalidated, struct amdgpu_bo_va,
- 					 base.vm_status);
- 		bo = bo_va->base.bo;
- 		resv = bo->tbo.base.resv;
- 		spin_unlock(&vm->status_lock);
+ 	spin_lock(&vm->individual_lock);
+ 	while (!list_empty(&vm->individual.moved)) {
+ 		bo_va = list_first_entry(&vm->individual.moved,
+ 					 typeof(*bo_va), base.vm_status);
+ 		resv = bo_va->base.bo->tbo.base.resv;
+ 		spin_unlock(&vm->individual_lock);
  
  		/* Try to reserve the BO to avoid clearing its ptes */
 -		if (!adev->debug_vm && dma_resv_trylock(resv)) {
 +		if (!adev->debug_vm && !amdgpu_ttm_tt_get_usermm(bo->tbo.ttm) &&
 +		    dma_resv_trylock(resv)) {
  			clear = false;
  			unlock = true;
  		/* The caller is already holding the reservation lock */