UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2018-07-16 14:58:48 +02:00 committed by Alex Deucher
parent 9d46f32bdd
commit b528680170
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
View File

@ -1209,6 +1209,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,
{ {
struct amdgpu_ring *ring = p->ring; struct amdgpu_ring *ring = p->ring;
struct drm_sched_entity *entity = &p->ctx->rings[ring->idx].entity; struct drm_sched_entity *entity = &p->ctx->rings[ring->idx].entity;
enum drm_sched_priority priority;
struct amdgpu_job *job; struct amdgpu_job *job;
unsigned i; unsigned i;
uint64_t seq; uint64_t seq;
@ -1256,11 +1257,14 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,
job->uf_sequence = seq; job->uf_sequence = seq;
amdgpu_job_free_resources(job); amdgpu_job_free_resources(job);
amdgpu_ring_priority_get(p->ring, job->base.s_priority);
trace_amdgpu_cs_ioctl(job); trace_amdgpu_cs_ioctl(job);
priority = job->base.s_priority;
drm_sched_entity_push_job(&job->base, entity); 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); ttm_eu_fence_buffer_objects(&p->ticket, &p->validated, p->fence);
amdgpu_mn_unlock(p->mn); amdgpu_mn_unlock(p->mn);

8
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
View File

@ -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, int amdgpu_job_submit(struct amdgpu_job *job, struct drm_sched_entity *entity,
void *owner, struct dma_fence **f) 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; int r;
if (!f) if (!f)
@ -139,9 +140,12 @@ int amdgpu_job_submit(struct amdgpu_job *job, struct drm_sched_entity *entity,
job->owner = owner; job->owner = owner;
*f = dma_fence_get(&job->base.s_fence->finished); *f = dma_fence_get(&job->base.s_fence->finished);
amdgpu_job_free_resources(job); 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); drm_sched_entity_push_job(&job->base, entity);
ring = to_amdgpu_ring(entity->sched);
amdgpu_ring_priority_get(ring, priority);
return 0; return 0;
} }