1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 72dc9b36b937..7c5cc33d0cda 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -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);