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

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

drm/amdgpu: change ring priority after pushing the job (v2) 



Pushing a job can change the ring assignment of an entity.

v2: squash in:
"drm/amdgpu: fix job priority handling" (Christian)

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9d46f32b

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

+5 −1
Original line number Diff line number Diff line
@@ -1209,6 +1209,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, 
{

	struct amdgpu_ring *ring = p->ring;

	struct drm_sched_entity *entity = &p->ctx->rings[ring->idx].entity;

	enum drm_sched_priority priority;

	struct amdgpu_job *job;

	unsigned i;

	uint64_t seq;
@@ -1256,11 +1257,14 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, 
	job->uf_sequence = seq;



	amdgpu_job_free_resources(job);

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



	trace_amdgpu_cs_ioctl(job);

	priority = job->base.s_priority;

	drm_sched_entity_push_job(&job->base, entity);



	ring = to_amdgpu_ring(entity->sched);

	amdgpu_ring_priority_get(ring, priority);



	ttm_eu_fence_buffer_objects(&p->ticket, &p->validated, p->fence);

	amdgpu_mn_unlock(p->mn);

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

+6 −2
Original line number Diff line number Diff line
@@ -126,7 +126,8 @@ void amdgpu_job_free(struct amdgpu_job *job) 
int amdgpu_job_submit(struct amdgpu_job *job, struct drm_sched_entity *entity,

		      void *owner, struct dma_fence **f)

{

	struct amdgpu_ring *ring = to_amdgpu_ring(entity->sched);

	enum drm_sched_priority priority;

	struct amdgpu_ring *ring;

	int r;



	if (!f)
@@ -139,9 +140,12 @@ int amdgpu_job_submit(struct amdgpu_job *job, struct drm_sched_entity *entity, 
	job->owner = owner;

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

	amdgpu_job_free_resources(job);

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

	priority = job->base.s_priority;

	drm_sched_entity_push_job(&job->base, entity);



	ring = to_amdgpu_ring(entity->sched);

	amdgpu_ring_priority_get(ring, priority);



	return 0;

}