Merge drm/drm-next into drm-intel-next

[platform/kernel/linux-starfive.git] / drivers / gpu / drm / i915 / gt / intel_engine_cs.c

diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
index 8eea3da..376e82e 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
@@ -342,7 +342,7 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id)
        engine->schedule = NULL;
 
        ewma__engine_latency_init(&engine->latency);
-       seqlock_init(&engine->stats.lock);
+       seqcount_init(&engine->stats.lock);
 
        ATOMIC_INIT_NOTIFIER_HEAD(&engine->context_status_notifier);
 
@@ -1676,7 +1676,7 @@ void intel_engine_dump(struct intel_engine_cs *engine,
                           ktime_to_ms(intel_engine_get_busy_time(engine,
                                                                  &dummy)));
        drm_printf(m, "\tForcewake: %x domains, %d active\n",
-                  engine->fw_domain, atomic_read(&engine->fw_active));
+                  engine->fw_domain, READ_ONCE(engine->fw_active));
 
        rcu_read_lock();
        rq = READ_ONCE(engine->heartbeat.systole);
@@ -1754,7 +1754,7 @@ static ktime_t __intel_engine_get_busy_time(struct intel_engine_cs *engine,
         * add it to the total.
         */
        *now = ktime_get();
-       if (atomic_read(&engine->stats.active))
+       if (READ_ONCE(engine->stats.active))
                total = ktime_add(total, ktime_sub(*now, engine->stats.start));
 
        return total;
@@ -1773,9 +1773,9 @@ ktime_t intel_engine_get_busy_time(struct intel_engine_cs *engine, ktime_t *now)
        ktime_t total;
 
        do {
-               seq = read_seqbegin(&engine->stats.lock);
+               seq = read_seqcount_begin(&engine->stats.lock);
                total = __intel_engine_get_busy_time(engine, now);
-       } while (read_seqretry(&engine->stats.lock, seq));
+       } while (read_seqcount_retry(&engine->stats.lock, seq));
 
        return total;
 }
@@ -1811,7 +1811,7 @@ intel_engine_find_active_request(struct intel_engine_cs *engine)
                struct intel_timeline *tl = request->context->timeline;
 
                list_for_each_entry_from_reverse(request, &tl->requests, link) {
-                       if (i915_request_completed(request))
+                       if (__i915_request_is_complete(request))
                                break;
 
                        active = request;
@@ -1822,10 +1822,10 @@ intel_engine_find_active_request(struct intel_engine_cs *engine)
                return active;
 
        list_for_each_entry(request, &engine->active.requests, sched.link) {
-               if (i915_request_completed(request))
+               if (__i915_request_is_complete(request))
                        continue;
 
-               if (!i915_request_started(request))
+               if (!__i915_request_has_started(request))
                        continue;
 
                /* More than one preemptible request may match! */