Commit 6ab4054f authored by Pierre-Eric Pelloux-Prayer's avatar Pierre-Eric Pelloux-Prayer Committed by Alex Deucher
Browse files

drm/amdgpu: use TTM_NUM_MOVE_FENCES when reserving fences 



Use TTM_NUM_MOVE_FENCES as an upperbound of how many fences
ttm might need to deal with moves/evictions.

Signed-off-by: default avatarPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Acked-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e2b0c863

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

+2 −3
Original line number Diff line number Diff line
@@ -908,9 +908,8 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 
			goto out_free_user_pages;



		amdgpu_bo_list_for_each_entry(e, p->bo_list) {

			/* One fence for TTM and one for each CS job */

			r = drm_exec_prepare_obj(&p->exec, &e->bo->tbo.base,

						 1 + p->gang_size);

						 TTM_NUM_MOVE_FENCES + p->gang_size);

			drm_exec_retry_on_contention(&p->exec);

			if (unlikely(r))

				goto out_free_user_pages;
@@ -920,7 +919,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 


		if (p->uf_bo) {

			r = drm_exec_prepare_obj(&p->exec, &p->uf_bo->tbo.base,

						 1 + p->gang_size);

						 TTM_NUM_MOVE_FENCES + p->gang_size);

			drm_exec_retry_on_contention(&p->exec);

			if (unlikely(r))

				goto out_free_user_pages;

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

+2 −4
Original line number Diff line number Diff line
@@ -328,11 +328,9 @@ static int amdgpu_vkms_prepare_fb(struct drm_plane *plane, 
		return r;

	}



	r = dma_resv_reserve_fences(rbo->tbo.base.resv, 1);

	if (r) {

		dev_err(adev->dev, "allocating fence slot failed (%d)\n", r);

	r = dma_resv_reserve_fences(rbo->tbo.base.resv, TTM_NUM_MOVE_FENCES);

	if (r)

		goto error_unlock;

	}



	if (plane->type != DRM_PLANE_TYPE_CURSOR)

		domain = amdgpu_display_supported_domains(adev, rbo->flags);

drivers/gpu/drm/amd/amdkfd/kfd_svm.c

+1 −2
Original line number Diff line number Diff line
@@ -628,9 +628,8 @@ svm_range_vram_node_new(struct kfd_node *node, struct svm_range *prange, 
		}

	}



	r = dma_resv_reserve_fences(bo->tbo.base.resv, 1);

	r = dma_resv_reserve_fences(bo->tbo.base.resv, TTM_NUM_MOVE_FENCES);

	if (r) {

		pr_debug("failed %d to reserve bo\n", r);

		amdgpu_bo_unreserve(bo);

		goto reserve_bo_failed;

	}

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c

+2 −4
Original line number Diff line number Diff line
@@ -954,11 +954,9 @@ static int amdgpu_dm_plane_helper_prepare_fb(struct drm_plane *plane, 
		return r;

	}



	r = dma_resv_reserve_fences(rbo->tbo.base.resv, 1);

	if (r) {

		drm_err(adev_to_drm(adev), "reserving fence slot failed (%d)\n", r);

	r = dma_resv_reserve_fences(rbo->tbo.base.resv, TTM_NUM_MOVE_FENCES);

	if (r)

		goto error_unlock;

	}



	if (plane->type != DRM_PLANE_TYPE_CURSOR)

		domain = amdgpu_display_supported_domains(adev, rbo->flags);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c

+2 −4
Original line number Diff line number Diff line
@@ -106,11 +106,9 @@ static int amdgpu_dm_wb_prepare_job(struct drm_writeback_connector *wb_connector 
		return r;

	}



	r = dma_resv_reserve_fences(rbo->tbo.base.resv, 1);

	if (r) {

		drm_err(adev_to_drm(adev), "reserving fence slot failed (%d)\n", r);

	r = dma_resv_reserve_fences(rbo->tbo.base.resv, TTM_NUM_MOVE_FENCES);

	if (r)

		goto error_unlock;

	}



	domain = amdgpu_display_supported_domains(adev, rbo->flags);