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

Commit 0abc6878 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: update VM PDs after the PTs 



Necessary for the next patch.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Acked-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ec363e0d

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

+4 −4
Original line number Diff line number Diff line
@@ -778,10 +778,6 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p) 
	struct amdgpu_bo *bo;

	int i, r;



	r = amdgpu_vm_update_directories(adev, vm);

	if (r)

		return r;



	r = amdgpu_vm_clear_freed(adev, vm, NULL);

	if (r)

		return r;
@@ -839,6 +835,10 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p) 
	if (r)

		return r;



	r = amdgpu_vm_update_directories(adev, vm);

	if (r)

		return r;



	r = amdgpu_sync_fence(adev, &p->job->sync, vm->last_update, false);

	if (r)

		return r;

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

+4 −4
Original line number Diff line number Diff line
@@ -518,10 +518,6 @@ static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev, 
	if (!amdgpu_vm_ready(vm))

		return;



	r = amdgpu_vm_update_directories(adev, vm);

	if (r)

		goto error;



	r = amdgpu_vm_clear_freed(adev, vm, NULL);

	if (r)

		goto error;
@@ -530,6 +526,10 @@ static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev, 
	    operation == AMDGPU_VA_OP_REPLACE)

		r = amdgpu_vm_bo_update(adev, bo_va, false);



	r = amdgpu_vm_update_directories(adev, vm);

	if (r)

		goto error;



error:

	if (r && r != -ERESTARTSYS)

		DRM_ERROR("Couldn't update BO_VA (%d)\n", r);