Commit 4671078e authored by Christian König's avatar Christian König
Browse files

drm/amdgpu: switch over to the new pin interface 



Stop using TTM_PL_FLAG_NO_EVICT.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Tested-by: default avatarNirmoy Das <nirmoy.das@amd.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Link: https://patchwork.freedesktop.org/patch/391617/?series=81973&rev=1
parent 0b8793f6

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

+3 −2
Original line number Diff line number Diff line
@@ -1479,7 +1479,7 @@ int amdgpu_amdkfd_gpuvm_map_memory_to_gpu( 
		}

	}



	if (!amdgpu_ttm_tt_get_usermm(bo->tbo.ttm) && !bo->pin_count)

	if (!amdgpu_ttm_tt_get_usermm(bo->tbo.ttm) && !bo->tbo.pin_count)

		amdgpu_bo_fence(bo,

				&avm->process_info->eviction_fence->base,

				true);
@@ -1558,7 +1558,8 @@ int amdgpu_amdkfd_gpuvm_unmap_memory_from_gpu( 
	 * required.

	 */

	if (mem->mapped_to_gpu_memory == 0 &&

	    !amdgpu_ttm_tt_get_usermm(mem->bo->tbo.ttm) && !mem->bo->pin_count)

	    !amdgpu_ttm_tt_get_usermm(mem->bo->tbo.ttm) &&

	    !mem->bo->tbo.pin_count)

		amdgpu_amdkfd_remove_eviction_fence(mem->bo,

						process_info->eviction_fence);

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

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ static int amdgpu_cs_bo_validate(struct amdgpu_cs_parser *p, 
	uint32_t domain;

	int r;



	if (bo->pin_count)

	if (bo->tbo.pin_count)

		return 0;



	/* Don't move this buffer if we have depleted our allowance

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

+2 −6
Original line number Diff line number Diff line
@@ -132,10 +132,7 @@ static void amdgpu_display_unpin_work_func(struct work_struct *__work) 
	/* unpin of the old buffer */

	r = amdgpu_bo_reserve(work->old_abo, true);

	if (likely(r == 0)) {

		r = amdgpu_bo_unpin(work->old_abo);

		if (unlikely(r != 0)) {

			DRM_ERROR("failed to unpin buffer after flip\n");

		}

		amdgpu_bo_unpin(work->old_abo);

		amdgpu_bo_unreserve(work->old_abo);

	} else

		DRM_ERROR("failed to reserve buffer after flip\n");
@@ -249,8 +246,7 @@ int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc, 
	}

unpin:

	if (!adev->enable_virtual_display)

		if (unlikely(amdgpu_bo_unpin(new_abo) != 0))

			DRM_ERROR("failed to unpin new abo in error path\n");

		amdgpu_bo_unpin(new_abo);



unreserve:

	amdgpu_bo_unreserve(new_abo);

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

+3 −2
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static struct sg_table *amdgpu_dma_buf_map(struct dma_buf_attachment *attach, 
	struct sg_table *sgt;

	long r;



	if (!bo->pin_count) {

	if (!bo->tbo.pin_count) {

		/* move buffer into GTT or VRAM */

		struct ttm_operation_ctx ctx = { false, false };

		unsigned domains = AMDGPU_GEM_DOMAIN_GTT;
@@ -390,7 +390,8 @@ static int amdgpu_dma_buf_begin_cpu_access(struct dma_buf *dma_buf, 
	if (unlikely(ret != 0))

		return ret;



	if (!bo->pin_count && (bo->allowed_domains & AMDGPU_GEM_DOMAIN_GTT)) {

	if (!bo->tbo.pin_count &&

	    (bo->allowed_domains & AMDGPU_GEM_DOMAIN_GTT)) {

		amdgpu_bo_placement_from_domain(bo, AMDGPU_GEM_DOMAIN_GTT);

		ret = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ static int amdgpu_debugfs_gem_bo_info(int id, void *ptr, void *data) 
	seq_printf(m, "\t0x%08x: %12ld byte %s",

		   id, amdgpu_bo_size(bo), placement);



	pin_count = READ_ONCE(bo->pin_count);

	pin_count = READ_ONCE(bo->tbo.pin_count);

	if (pin_count)

		seq_printf(m, " pin count %d", pin_count);