summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
diff options
context:
space:
mode:
authorAndrey Grodzovsky <Andrey.Grodzovsky@amd.com>2017-10-19 14:29:46 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-12-04 16:33:08 -0500
commitd1f6dc1a9a106a73510181cfad9b4a7a0b140990 (patch)
treed596b7bcfbac180a1d478dd3bebba45dc56ea404 /drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
parentca797d29cd63e7b71b4eea29aff3b1cefd1ecb59 (diff)
downloadlwn-d1f6dc1a9a106a73510181cfad9b4a7a0b140990.tar.gz
lwn-d1f6dc1a9a106a73510181cfad9b4a7a0b140990.zip
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/scheduler/gpu_scheduler.c')
-rw-r--r--drivers/gpu/drm/amd/scheduler/gpu_scheduler.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
index 92ec663fdada..9061c88e3e0c 100644
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
@@ -529,6 +529,7 @@ int amd_sched_job_init(struct amd_sched_job *job,
{
job->sched = sched;
job->s_entity = entity;
+ job->s_priority = entity->rq - sched->sched_rq;
job->s_fence = amd_sched_fence_create(entity, owner);
if (!job->s_fence)
return -ENOMEM;