Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfe2c978 authored by monk.liu's avatar monk.liu Committed by Alex Deucher
Browse files

drm/amdgpu: sync fence of clear_invalids (v2) 



bo_va may un-initialized, fix it.

Signed-off-by: default avatarmonk.liu <monk.liu@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarJammy Zhou <jammy.zhou@amd.com>
parent 3d5a08c1

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −1
Original line number Diff line number Diff line
@@ -2268,7 +2268,7 @@ int amdgpu_vm_update_page_directory(struct amdgpu_device *adev, 
int amdgpu_vm_clear_freed(struct amdgpu_device *adev,

				struct amdgpu_vm *vm);

int amdgpu_vm_clear_invalids(struct amdgpu_device *adev,

				struct amdgpu_vm *vm);

				struct amdgpu_vm *vm, struct amdgpu_sync *sync);

int amdgpu_vm_bo_update(struct amdgpu_device *adev,

			struct amdgpu_bo_va *bo_va,

			struct ttm_mem_reg *mem);

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

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p, 


		amdgpu_sync_fence(&p->ibs[0].sync, bo_va->last_pt_update);

	}

	return amdgpu_vm_clear_invalids(adev, vm);

	return amdgpu_vm_clear_invalids(adev, vm, &p->ibs[0].sync);

}



static int amdgpu_cs_ib_vm_chunk(struct amdgpu_device *adev,

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

+4 −2
Original line number Diff line number Diff line
@@ -858,9 +858,9 @@ int amdgpu_vm_clear_freed(struct amdgpu_device *adev, 
 * PTs have to be reserved and mutex must be locked!

 */

int amdgpu_vm_clear_invalids(struct amdgpu_device *adev,

			     struct amdgpu_vm *vm)

			     struct amdgpu_vm *vm, struct amdgpu_sync *sync)

{

	struct amdgpu_bo_va *bo_va;

	struct amdgpu_bo_va *bo_va = NULL;

	int r;



	spin_lock(&vm->status_lock);
@@ -877,6 +877,8 @@ int amdgpu_vm_clear_invalids(struct amdgpu_device *adev, 
	}

	spin_unlock(&vm->status_lock);



	if (bo_va)

		amdgpu_sync_fence(sync, bo_va->last_pt_update);

	return 0;

}