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

Commit 10e709cb authored by Chunming Zhou's avatar Chunming Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: fix deadlock of reservation between cs and gpu reset v2 



the case could happen when gpu reset:
1. when gpu reset, cs can be continue until sw queue is full, then push job will wait with holding pd reservation.
2. gpu_reset routine will also need pd reservation to restore page table from their shadow.
3. cs is waiting for gpu_reset complete, but gpu reset is waiting for cs releases reservation.

v2: handle amdgpu_cs_submit error path.

Signed-off-by: default avatarChunming Zhou <David1.Zhou@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: default avatarMonk Liu <monk.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 44eb8c1b

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

+4 −0
Original line number Diff line number Diff line
@@ -1074,6 +1074,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, 
	cs->out.handle = amdgpu_ctx_add_fence(p->ctx, ring, p->fence);

	job->uf_sequence = cs->out.handle;

	amdgpu_job_free_resources(job);

	amdgpu_cs_parser_fini(p, 0, true);



	trace_amdgpu_cs_ioctl(job);

	amd_sched_entity_push_job(&job->base);
@@ -1129,7 +1130,10 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
		goto out;



	r = amdgpu_cs_submit(&parser, cs);

	if (r)

		goto out;



	return 0;

out:

	amdgpu_cs_parser_fini(&parser, r, reserved_buffers);

	return r;