drm/i915: Pass intel_gt to intel_engines_init (7841fcbd) · Commits · 戴 / test

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -326,7 +326,7 @@ __intel_ring_space(unsigned int head, unsigned int tail, unsigned int size)

		int intel_engines_init_mmio(struct intel_gt *gt);
		int intel_engines_setup(struct intel_gt *gt);
		int intel_engines_init(struct drm_i915_private *i915);
		int intel_engines_init(struct intel_gt *gt);
		void intel_engines_cleanup(struct intel_gt *gt);

		int intel_engine_init_common(struct intel_engine_cs *engine);

+5 −5

Original line number	Diff line number	Diff line
		@@ -451,23 +451,23 @@ cleanup:

		/**
		* intel_engines_init() - init the Engine Command Streamers
		* @i915: i915 device private
		* @gt: pointer to struct intel_gt
		*
		* Return: non-zero if the initialization failed.
		*/
		int intel_engines_init(struct drm_i915_private *i915)
		int intel_engines_init(struct intel_gt *gt)
		{
		int (init)(struct intel_engine_cs engine);
		struct intel_engine_cs *engine;
		enum intel_engine_id id;
		int err;

		if (HAS_EXECLISTS(i915))
		if (HAS_EXECLISTS(gt->i915))
		init = intel_execlists_submission_init;
		else
		init = intel_ring_submission_init;

		for_each_engine(engine, i915, id) {
		for_each_engine(engine, gt, id) {
		err = init(engine);
		if (err)
		goto cleanup;
		@@ -476,7 +476,7 @@ int intel_engines_init(struct drm_i915_private *i915)
		return 0;

		cleanup:
		intel_engines_cleanup(&i915->gt);
		intel_engines_cleanup(gt);
		return err;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -1261,7 +1261,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
		goto err_scratch;
		}

		ret = intel_engines_init(dev_priv);
		ret = intel_engines_init(&dev_priv->gt);
		if (ret) {
		GEM_BUG_ON(ret == -EIO);
		goto err_context;