Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51b9db27 authored by Chunming Zhou's avatar Chunming Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: wait forever for wait emit 



the job must be emitted by scheduler, otherwise scheduler is abnormal.

Signed-off-by: default avatarChunming Zhou <david1.zhou@amd.com>
Reviewed-by: default avatarChristian K?nig <christian.koenig@amd.com>
parent 4afcb303

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

+2 −2
Original line number Diff line number Diff line
@@ -302,8 +302,8 @@ struct fence *amdgpu_ctx_get_fence(struct amdgpu_ctx *ctx, 
	if (amdgpu_enable_scheduler) {

		r = amd_sched_wait_emit(&cring->c_entity,

					seq,

					true,

					AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS);

					false,

					-1);

		if (r)

			return NULL;

	}

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

+3 −3
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev, 
				   sched_job);

		r = amd_sched_wait_emit(&adev->kernel_ctx->rings[ring->idx].c_entity,

					v_seq,

					true,

					false,

					-1);

		if (r)

			DRM_ERROR("emit timeout\n");
@@ -537,7 +537,7 @@ int amdgpu_vm_update_page_directory(struct amdgpu_device *adev, 
					   sched_job);

			r = amd_sched_wait_emit(&adev->kernel_ctx->rings[ring->idx].c_entity,

						v_seq,

						true,

						false,

						-1);

			if (r)

				DRM_ERROR("emit timeout\n");
@@ -890,7 +890,7 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev, 
				   sched_job);

		r = amd_sched_wait_emit(&adev->kernel_ctx->rings[ring->idx].c_entity,

					v_seq,

					true,

					false,

					-1);

		if (r)

			DRM_ERROR("emit timeout\n");