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

Commit 3d138c14 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

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



This reverts commit 10e709cb.

The patch doesn't work at all:
1. The CS can still be blocked because of amdgpu_ctx_add_fence().
2. The order of submission isn't correct any more.
3. We could end up using freed up memory because we now drop the
   ctx reference to early.

This needs to be fixed cleanly by doing the context handling after the BO
handling, but this is a larger task just avoid the obvious crashes for now.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarMonk Liu <monk.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 403df1f6

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

+0 −4
Original line number Diff line number Diff line
@@ -1153,7 +1153,6 @@ 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);
@@ -1211,10 +1210,7 @@ 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;