Commit 19a1d935 authored by Nirmoy Das's avatar Nirmoy Das Committed by Alex Deucher
Browse files

drm/amdgpu: flush gart changes after all BO recovery 



Don't flush gart changes after recovering each BO instead
do it after recovering all the BOs. Flishing gart also needed
for amdgpu_ttm_alloc_gart().

v4: use containerof to retrieve adev struct.
v3: rename amdgpu_gart_tlb_flush() -> amdgpu_gart_invalidate_tlb().
v2: abstract out gart tlb flushing logic to amdgpu_gart.c

Signed-off-by: default avatarNirmoy Das <nirmoy.das@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c7b9aa7a

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

+15 −7
Original line number Diff line number Diff line
@@ -312,8 +312,6 @@ int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset, 
		     int pages, struct page **pagelist, dma_addr_t *dma_addr,

		     uint64_t flags)

{

	int r, i;



	if (!adev->gart.ready) {

		WARN(1, "trying to bind memory to uninitialized GART !\n");

		return -EINVAL;
@@ -322,16 +320,26 @@ int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset, 
	if (!adev->gart.ptr)

		return 0;



	r = amdgpu_gart_map(adev, offset, pages, dma_addr, flags,

	return amdgpu_gart_map(adev, offset, pages, dma_addr, flags,

			       adev->gart.ptr);

	if (r)

		return r;

}



/**

 * amdgpu_gart_invalidate_tlb - invalidate gart TLB

 *

 * @adev: amdgpu device driver pointer

 *

 * Invalidate gart TLB which can be use as a way to flush gart changes

 *

 */

void amdgpu_gart_invalidate_tlb(struct amdgpu_device *adev)

{

	int i;



	mb();

	amdgpu_asic_flush_hdp(adev, NULL);

	for (i = 0; i < adev->num_vmhubs; i++)

		amdgpu_gmc_flush_gpu_tlb(adev, 0, i, 0);

	return 0;

}



/**

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

+1 −1
Original line number Diff line number Diff line
@@ -66,5 +66,5 @@ int amdgpu_gart_map(struct amdgpu_device *adev, uint64_t offset, 
int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset,

		     int pages, struct page **pagelist,

		     dma_addr_t *dma_addr, uint64_t flags);



void amdgpu_gart_invalidate_tlb(struct amdgpu_device *adev);

#endif

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

+4 −0
Original line number Diff line number Diff line
@@ -206,10 +206,12 @@ uint64_t amdgpu_gtt_mgr_usage(struct ttm_resource_manager *man) 
int amdgpu_gtt_mgr_recover(struct ttm_resource_manager *man)

{

	struct amdgpu_gtt_mgr *mgr = to_gtt_mgr(man);

	struct amdgpu_device *adev;

	struct amdgpu_gtt_node *node;

	struct drm_mm_node *mm_node;

	int r = 0;



	adev = container_of(mgr, typeof(*adev), mman.gtt_mgr);

	spin_lock(&mgr->lock);

	drm_mm_for_each_node(mm_node, &mgr->mm) {

		node = container_of(mm_node, struct amdgpu_gtt_node, node);
@@ -219,6 +221,8 @@ int amdgpu_gtt_mgr_recover(struct ttm_resource_manager *man) 
	}

	spin_unlock(&mgr->lock);



	amdgpu_gart_invalidate_tlb(adev);



	return r;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -1012,6 +1012,7 @@ int amdgpu_ttm_alloc_gart(struct ttm_buffer_object *bo) 
			return r;

		}



		amdgpu_gart_invalidate_tlb(adev);

		ttm_resource_free(bo, &bo->mem);

		bo->mem = tmp;

	}