drm/i915: Pass intel_gt to intel_engines_setup (78f60603) · Commits · 戴 / test

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -325,7 +325,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 drm_i915_private *i915);
		int intel_engines_setup(struct intel_gt *gt);
		int intel_engines_init(struct drm_i915_private *i915);
		void intel_engines_cleanup(struct intel_gt *gt);

+5 −5

Original line number	Diff line number	Diff line
		@@ -623,26 +623,26 @@ static int intel_engine_setup_common(struct intel_engine_cs *engine)

		/**
		* intel_engines_setup- setup engine state not requiring hw access
		* @i915: Device to setup.
		* @gt: pointer to struct intel_gt
		*
		* Initializes engine structure members shared between legacy and execlists
		* submission modes which do not require hardware access.
		*
		* Typically done early in the submission mode specific engine setup stage.
		*/
		int intel_engines_setup(struct drm_i915_private *i915)
		int intel_engines_setup(struct intel_gt *gt)
		{
		int (setup)(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))
		setup = intel_execlists_submission_setup;
		else
		setup = intel_ring_submission_setup;

		for_each_engine(engine, i915, id) {
		for_each_engine(engine, gt, id) {
		err = intel_engine_setup_common(engine);
		if (err)
		goto cleanup;
		@@ -660,7 +660,7 @@ int intel_engines_setup(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
		@@ -1249,7 +1249,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv)

		intel_gt_init(&dev_priv->gt);

		ret = intel_engines_setup(dev_priv);
		ret = intel_engines_setup(&dev_priv->gt);
		if (ret) {
		GEM_BUG_ON(ret == -EIO);
		goto err_unlock;