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

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

drm/amdgpu: remove fence context from the job 



Can be obtained directly from the fence as well.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Acked-by: default avatarChunming Zhou <david1.zhou@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 050d9d43

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

+0 −1
Original line number Diff line number Diff line
@@ -1239,7 +1239,6 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, 
	}



	job->owner = p->filp;

	job->fence_ctx = entity->fence_context;

	p->fence = dma_fence_get(&job->base.s_fence->finished);



	r = amdgpu_ctx_add_fence(p->ctx, ring, p->fence, &seq);

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

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
	/* ring tests don't use a job */

	if (job) {

		vm = job->vm;

		fence_ctx = job->fence_ctx;

		fence_ctx = job->base.s_fence->scheduled.context;

	} else {

		vm = NULL;

		fence_ctx = 0;

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

+0 −1
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ int amdgpu_job_submit(struct amdgpu_job *job, struct amdgpu_ring *ring, 
		return r;



	job->owner = owner;

	job->fence_ctx = entity->fence_context;

	*f = dma_fence_get(&job->base.s_fence->finished);

	amdgpu_job_free_resources(job);

	amdgpu_ring_priority_get(job->ring, job->base.s_priority);

drivers/gpu/drm/amd/amdgpu/amdgpu_job.h

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ struct amdgpu_job { 
	uint32_t		preamble_status;

	uint32_t		num_ibs;

	void			*owner;

	uint64_t		fence_ctx; /* the fence_context this job uses */

	bool                    vm_needs_flush;

	uint64_t		vm_pd_addr;

	unsigned		vmid;