drm/i915/execlists: Mark up data-races in virtual engines

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / gt / intel_lrc.c

diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
index 0604b11..ee378a0 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -1004,7 +1004,7 @@ __unwind_incomplete_requests(struct intel_engine_cs *engine)
                                i915_request_cancel_breadcrumb(rq);
                                spin_unlock(&rq->lock);
                        }
-                       rq->engine = owner;
+                       WRITE_ONCE(rq->engine, owner);
                        owner->submit_request(rq);
                        active = NULL;
                }
@@ -2033,13 +2033,14 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
                                     "",
                                     yesno(engine != ve->siblings[0]));
 
-                       ve->request = NULL;
-                       ve->base.execlists.queue_priority_hint = INT_MIN;
+                       WRITE_ONCE(ve->request, NULL);
+                       WRITE_ONCE(ve->base.execlists.queue_priority_hint,
+                                  INT_MIN);
                        rb_erase_cached(rb, &execlists->virtual);
                        RB_CLEAR_NODE(rb);
 
                        GEM_BUG_ON(!(rq->execution_mask & engine->mask));
-                       rq->engine = engine;
+                       WRITE_ONCE(rq->engine, engine);
 
                        if (engine != ve->siblings[0]) {
                                u32 *regs = ve->context.lrc_reg_state;
@@ -4944,7 +4945,7 @@ static intel_engine_mask_t virtual_submission_mask(struct virtual_engine *ve)
 static void virtual_submission_tasklet(unsigned long data)
 {
        struct virtual_engine * const ve = (struct virtual_engine *)data;
-       const int prio = ve->base.execlists.queue_priority_hint;
+       const int prio = READ_ONCE(ve->base.execlists.queue_priority_hint);
        intel_engine_mask_t mask;
        unsigned int n;