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

Commit 1e293037 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: clear PDs/PTs only after initializing them 



Clear the VM PDs/PTs only after initializing all the structures.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 672e78ca

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

+6 −5
Original line number Diff line number Diff line
@@ -945,10 +945,6 @@ int amdgpu_vm_alloc_pts(struct amdgpu_device *adev, 
		if (r)

			return r;



		r = amdgpu_vm_clear_bo(adev, vm, pt, cursor.level, ats);

		if (r)

			goto error_free_pt;



		if (vm->use_cpu_for_update) {

			r = amdgpu_bo_kmap(pt, NULL);

			if (r)
@@ -961,6 +957,10 @@ int amdgpu_vm_alloc_pts(struct amdgpu_device *adev, 
		pt->parent = amdgpu_bo_ref(cursor.parent->base.bo);



		amdgpu_vm_bo_base_init(&entry->base, vm, pt);



		r = amdgpu_vm_clear_bo(adev, vm, pt, cursor.level, ats);

		if (r)

			goto error_free_pt;

	}



	return 0;
@@ -3031,13 +3031,14 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
	if (r)

		goto error_unreserve;



	amdgpu_vm_bo_base_init(&vm->root.base, vm, root);



	r = amdgpu_vm_clear_bo(adev, vm, root,

			       adev->vm_manager.root_level,

			       vm->pte_support_ats);

	if (r)

		goto error_unreserve;



	amdgpu_vm_bo_base_init(&vm->root.base, vm, root);

	amdgpu_bo_unreserve(vm->root.base.bo);



	if (pasid) {