Commit 05d24935 authored by Rob Clark's avatar Rob Clark
Browse files

drm/exec: Pass in initial # of objects 



In cases where the # is known ahead of time, it is silly to do the table
resize dance.

Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Patchwork: https://patchwork.freedesktop.org/patch/568338/
parent 3a48a403

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

+4 −4
Original line number Diff line number Diff line
@@ -1137,7 +1137,7 @@ static int reserve_bo_and_vm(struct kgd_mem *mem, 


	ctx->n_vms = 1;

	ctx->sync = &mem->sync;

	drm_exec_init(&ctx->exec, DRM_EXEC_INTERRUPTIBLE_WAIT);

	drm_exec_init(&ctx->exec, DRM_EXEC_INTERRUPTIBLE_WAIT, 0);

	drm_exec_until_all_locked(&ctx->exec) {

		ret = amdgpu_vm_lock_pd(vm, &ctx->exec, 2);

		drm_exec_retry_on_contention(&ctx->exec);
@@ -1176,7 +1176,7 @@ static int reserve_bo_and_cond_vms(struct kgd_mem *mem, 
	int ret;



	ctx->sync = &mem->sync;

	drm_exec_init(&ctx->exec, DRM_EXEC_INTERRUPTIBLE_WAIT);

	drm_exec_init(&ctx->exec, DRM_EXEC_INTERRUPTIBLE_WAIT, 0);

	drm_exec_until_all_locked(&ctx->exec) {

		ctx->n_vms = 0;

		list_for_each_entry(entry, &mem->attachments, list) {
@@ -2552,7 +2552,7 @@ static int validate_invalid_user_pages(struct amdkfd_process_info *process_info) 


	amdgpu_sync_create(&sync);



	drm_exec_init(&exec, 0);

	drm_exec_init(&exec, 0, 0);

	/* Reserve all BOs and page tables for validation */

	drm_exec_until_all_locked(&exec) {

		/* Reserve all the page directories */
@@ -2793,7 +2793,7 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence **ef) 


	mutex_lock(&process_info->lock);



	drm_exec_init(&exec, 0);

	drm_exec_init(&exec, 0, 0);

	drm_exec_until_all_locked(&exec) {

		list_for_each_entry(peer_vm, &process_info->vm_list_head,

				    vm_list_node) {

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

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, 


	amdgpu_sync_create(&p->sync);

	drm_exec_init(&p->exec, DRM_EXEC_INTERRUPTIBLE_WAIT |

		      DRM_EXEC_IGNORE_DUPLICATES);

		      DRM_EXEC_IGNORE_DUPLICATES, 0);

	return 0;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
	struct drm_exec exec;

	int r;



	drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT);

	drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT, 0);

	drm_exec_until_all_locked(&exec) {

		r = amdgpu_vm_lock_pd(vm, &exec, 0);

		if (likely(!r))
@@ -110,7 +110,7 @@ int amdgpu_unmap_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
	struct drm_exec exec;

	int r;



	drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT);

	drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT, 0);

	drm_exec_until_all_locked(&exec) {

		r = amdgpu_vm_lock_pd(vm, &exec, 0);

		if (likely(!r))

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

+2 −2
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static void amdgpu_gem_object_close(struct drm_gem_object *obj, 
	struct drm_exec exec;

	long r;



	drm_exec_init(&exec, DRM_EXEC_IGNORE_DUPLICATES);

	drm_exec_init(&exec, DRM_EXEC_IGNORE_DUPLICATES, 0);

	drm_exec_until_all_locked(&exec) {

		r = drm_exec_prepare_obj(&exec, &bo->tbo.base, 1);

		drm_exec_retry_on_contention(&exec);
@@ -739,7 +739,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, 
	}



	drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT |

		      DRM_EXEC_IGNORE_DUPLICATES);

		      DRM_EXEC_IGNORE_DUPLICATES, 0);

	drm_exec_until_all_locked(&exec) {

		if (gobj) {

			r = drm_exec_lock_obj(&exec, gobj);

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

+2 −2
Original line number Diff line number Diff line
@@ -1122,7 +1122,7 @@ int amdgpu_mes_ctx_map_meta_data(struct amdgpu_device *adev, 


	amdgpu_sync_create(&sync);



	drm_exec_init(&exec, 0);

	drm_exec_init(&exec, 0, 0);

	drm_exec_until_all_locked(&exec) {

		r = drm_exec_lock_obj(&exec,

				      &ctx_data->meta_data_obj->tbo.base);
@@ -1193,7 +1193,7 @@ int amdgpu_mes_ctx_unmap_meta_data(struct amdgpu_device *adev, 
	struct drm_exec exec;

	long r;



	drm_exec_init(&exec, 0);

	drm_exec_init(&exec, 0, 0);

	drm_exec_until_all_locked(&exec) {

		r = drm_exec_lock_obj(&exec,

				      &ctx_data->meta_data_obj->tbo.base);