nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

drm/amdgpu: remove fence context from the job

Browse source 
Can be obtained directly from the fence as well.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Acked-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-13 09:58:49 +02:00 committed by Alex Deucher
parent 050d9d43a7
commit eb3961a574
4 changed files with 1 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
View file

@ -1239,7 +1239,6 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,
} }
job->owner = p->filp; job->owner = p->filp;
job->fence_ctx = entity->fence_context;
p->fence = dma_fence_get(&job->base.s_fence->finished); p->fence = dma_fence_get(&job->base.s_fence->finished);
r = amdgpu_ctx_add_fence(p->ctx, ring, p->fence, &seq); r = amdgpu_ctx_add_fence(p->ctx, ring, p->fence, &seq);

2
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
View file

@ -139,7 +139,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
/* ring tests don't use a job */ /* ring tests don't use a job */
if (job) { if (job) {
vm = job->vm; vm = job->vm;
fence_ctx = job->fence_ctx; fence_ctx = job->base.s_fence->scheduled.context;
} else { } else {
vm = NULL; vm = NULL;
fence_ctx = 0; fence_ctx = 0;

1
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
View file

@ -132,7 +132,6 @@ int amdgpu_job_submit(struct amdgpu_job *job, struct amdgpu_ring *ring,
return r; return r;
job->owner = owner; job->owner = owner;
job->fence_ctx = entity->fence_context;
*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(job->ring, job->base.s_priority); amdgpu_ring_priority_get(job->ring, job->base.s_priority);

1
drivers/gpu/drm/amd/amdgpu/amdgpu_job.h
View file

@ -45,7 +45,6 @@ struct amdgpu_job {
uint32_t preamble_status; uint32_t preamble_status;
uint32_t num_ibs; uint32_t num_ibs;
void *owner; void *owner;
uint64_t fence_ctx; /* the fence_context this job uses */
bool vm_needs_flush; bool vm_needs_flush;
uint64_t vm_pd_addr; uint64_t vm_pd_addr;
unsigned vmid; unsigned vmid;