Commit d6050943 authored by Eric Huang's avatar Eric Huang Committed by Alex Deucher
Browse files

Revert "drm/amdgpu: Add table_freed parameter to amdgpu_vm_bo_update" 



This reverts commit 075e8080.

Reason for revert: the related commit is reverted.

Signed-off-by: default avatarEric Huang <jinhuieric.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c37387c3

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

+3 −3
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p) 
	if (r)

		return r;



	r = amdgpu_vm_bo_update(adev, fpriv->prt_va, false, NULL);

	r = amdgpu_vm_bo_update(adev, fpriv->prt_va, false);

	if (r)

		return r;
@@ -792,7 +792,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p) 
	if (amdgpu_mcbp || amdgpu_sriov_vf(adev)) {

		bo_va = fpriv->csa_va;

		BUG_ON(!bo_va);

		r = amdgpu_vm_bo_update(adev, bo_va, false, NULL);

		r = amdgpu_vm_bo_update(adev, bo_va, false);

		if (r)

			return r;
@@ -811,7 +811,7 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p) 
		if (bo_va == NULL)

			continue;



		r = amdgpu_vm_bo_update(adev, bo_va, false, NULL);

		r = amdgpu_vm_bo_update(adev, bo_va, false);

		if (r)

			return r;

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

+1 −1
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ static void amdgpu_gem_va_update_vm(struct amdgpu_device *adev, 


	if (operation == AMDGPU_VA_OP_MAP ||

	    operation == AMDGPU_VA_OP_REPLACE) {

		r = amdgpu_vm_bo_update(adev, bo_va, false, NULL);

		r = amdgpu_vm_bo_update(adev, bo_va, false);

		if (r)

			goto error;

	}

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

+5 −5
Original line number Diff line number Diff line
@@ -1758,7 +1758,7 @@ int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev, 
	r = vm->update_funcs->commit(&params, fence);



	if (table_freed)

		*table_freed = *table_freed || params.table_freed;

		*table_freed = params.table_freed;



error_unlock:

	amdgpu_vm_eviction_unlock(vm);
@@ -1823,7 +1823,7 @@ void amdgpu_vm_get_memory(struct amdgpu_vm *vm, uint64_t *vram_mem, 
 * 0 for success, -EINVAL for failure.

 */

int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va,

			bool clear, bool *table_freed)

			bool clear)

{

	struct amdgpu_bo *bo = bo_va->base.bo;

	struct amdgpu_vm *vm = bo_va->base.vm;
@@ -1902,7 +1902,7 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va, 
						resv, mapping->start,

						mapping->last, update_flags,

						mapping->offset, mem,

						pages_addr, last_update, table_freed);

						pages_addr, last_update, NULL);

		if (r)

			return r;

	}
@@ -2154,7 +2154,7 @@ int amdgpu_vm_handle_moved(struct amdgpu_device *adev, 


	list_for_each_entry_safe(bo_va, tmp, &vm->moved, base.vm_status) {

		/* Per VM BOs never need to bo cleared in the page tables */

		r = amdgpu_vm_bo_update(adev, bo_va, false, NULL);

		r = amdgpu_vm_bo_update(adev, bo_va, false);

		if (r)

			return r;

	}
@@ -2173,7 +2173,7 @@ int amdgpu_vm_handle_moved(struct amdgpu_device *adev, 
		else

			clear = true;



		r = amdgpu_vm_bo_update(adev, bo_va, clear, NULL);

		r = amdgpu_vm_bo_update(adev, bo_va, clear);

		if (r)

			return r;

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

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev, 
				struct dma_fence **fence, bool *free_table);

int amdgpu_vm_bo_update(struct amdgpu_device *adev,

			struct amdgpu_bo_va *bo_va,

			bool clear, bool *table_freed);

			bool clear);

bool amdgpu_vm_evictable(struct amdgpu_bo *bo);

void amdgpu_vm_bo_invalidate(struct amdgpu_device *adev,

			     struct amdgpu_bo *bo, bool evicted);