drm/i915: Move intel_engine_context_in/out into intel_lrc.c (5932925a) · Commits · 戴 / test

drivers/gpu/drm/i915/gt/intel_engine.h

+0 −55

Original line number	Diff line number	Diff line
		@@ -290,61 +290,6 @@ void intel_engine_dump(struct intel_engine_cs *engine,
		struct drm_printer *m,
		const char *header, ...);

		static inline void intel_engine_context_in(struct intel_engine_cs *engine)
		{
		unsigned long flags;

		if (READ_ONCE(engine->stats.enabled) == 0)
		return;

		write_seqlock_irqsave(&engine->stats.lock, flags);

		if (engine->stats.enabled > 0) {
		if (engine->stats.active++ == 0)
		engine->stats.start = ktime_get();
		GEM_BUG_ON(engine->stats.active == 0);
		}

		write_sequnlock_irqrestore(&engine->stats.lock, flags);
		}

		static inline void intel_engine_context_out(struct intel_engine_cs *engine)
		{
		unsigned long flags;

		if (READ_ONCE(engine->stats.enabled) == 0)
		return;

		write_seqlock_irqsave(&engine->stats.lock, flags);

		if (engine->stats.enabled > 0) {
		ktime_t last;

		if (engine->stats.active && --engine->stats.active == 0) {
		/*
		* Decrement the active context count and in case GPU
		* is now idle add up to the running total.
		*/
		last = ktime_sub(ktime_get(), engine->stats.start);

		engine->stats.total = ktime_add(engine->stats.total,
		last);
		} else if (engine->stats.active == 0) {
		/*
		* After turning on engine stats, context out might be
		* the first event in which case we account from the
		* time stats gathering was turned on.
		*/
		last = ktime_sub(ktime_get(), engine->stats.enabled_at);

		engine->stats.total = ktime_add(engine->stats.total,
		last);
		}
		}

		write_sequnlock_irqrestore(&engine->stats.lock, flags);
		}

		int intel_enable_engine_stats(struct intel_engine_cs *engine);
		void intel_disable_engine_stats(struct intel_engine_cs *engine);

drivers/gpu/drm/i915/gt/intel_lrc.c

+55 −0

Original line number	Diff line number	Diff line
		@@ -944,6 +944,61 @@ execlists_context_status_change(struct i915_request *rq, unsigned long status)
		status, rq);
		}

		static void intel_engine_context_in(struct intel_engine_cs *engine)
		{
		unsigned long flags;

		if (READ_ONCE(engine->stats.enabled) == 0)
		return;

		write_seqlock_irqsave(&engine->stats.lock, flags);

		if (engine->stats.enabled > 0) {
		if (engine->stats.active++ == 0)
		engine->stats.start = ktime_get();
		GEM_BUG_ON(engine->stats.active == 0);
		}

		write_sequnlock_irqrestore(&engine->stats.lock, flags);
		}

		static void intel_engine_context_out(struct intel_engine_cs *engine)
		{
		unsigned long flags;

		if (READ_ONCE(engine->stats.enabled) == 0)
		return;

		write_seqlock_irqsave(&engine->stats.lock, flags);

		if (engine->stats.enabled > 0) {
		ktime_t last;

		if (engine->stats.active && --engine->stats.active == 0) {
		/*
		* Decrement the active context count and in case GPU
		* is now idle add up to the running total.
		*/
		last = ktime_sub(ktime_get(), engine->stats.start);

		engine->stats.total = ktime_add(engine->stats.total,
		last);
		} else if (engine->stats.active == 0) {
		/*
		* After turning on engine stats, context out might be
		* the first event in which case we account from the
		* time stats gathering was turned on.
		*/
		last = ktime_sub(ktime_get(), engine->stats.enabled_at);

		engine->stats.total = ktime_add(engine->stats.total,
		last);
		}
		}

		write_sequnlock_irqrestore(&engine->stats.lock, flags);
		}

		static inline struct intel_engine_cs *
		__execlists_schedule_in(struct i915_request *rq)
		{

Admin message