diff options
author | Andrey Grodzovsky <Andrey.Grodzovsky@amd.com> | 2017-10-19 14:29:46 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-12-04 16:33:08 -0500 |
commit | d1f6dc1a9a106a73510181cfad9b4a7a0b140990 (patch) | |
tree | d596b7bcfbac180a1d478dd3bebba45dc56ea404 /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |
parent | ca797d29cd63e7b71b4eea29aff3b1cefd1ecb59 (diff) |
drm/amdgpu: Avoid accessing job->entity after the job is scheduled.
Bug: amdgpu_job_free_cb was accessing s_job->s_entity when the allocated
amdgpu_ctx (and the entity inside it) were already deallocated from
amdgpu_cs_parser_fini.
Fix: Save job's priority on it's creation instead of accessing it from
s_entity later on.
Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Reviewed-by: Andres Rodriguez <andresx7@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 57abf7abd7a9..b4b3ecf9f96d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |||
@@ -1194,8 +1194,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, | |||
1194 | job->uf_sequence = seq; | 1194 | job->uf_sequence = seq; |
1195 | 1195 | ||
1196 | amdgpu_job_free_resources(job); | 1196 | amdgpu_job_free_resources(job); |
1197 | amdgpu_ring_priority_get(job->ring, | 1197 | amdgpu_ring_priority_get(job->ring, job->base.s_priority); |
1198 | amd_sched_get_job_priority(&job->base)); | ||
1199 | 1198 | ||
1200 | trace_amdgpu_cs_ioctl(job); | 1199 | trace_amdgpu_cs_ioctl(job); |
1201 | amd_sched_entity_push_job(&job->base); | 1200 | amd_sched_entity_push_job(&job->base); |