drm/i915/gt: Apply sanitiization just before resume (d03b224f) · Commits · 戴 / test

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -38,8 +38,6 @@ void intel_gt_init_early(struct intel_gt gt, struct drm_i915_private i915)
		void intel_gt_init_hw_early(struct intel_gt gt, struct i915_ggtt ggtt)
		{
		gt->ggtt = ggtt;

		intel_gt_sanitize(gt, false);
		}

		static void init_unused_ring(struct intel_gt *gt, u32 base)
		@@ -77,10 +75,6 @@ int intel_gt_init_hw(struct intel_gt *gt)
		struct intel_uncore *uncore = gt->uncore;
		int ret;

		ret = intel_gt_terminally_wedged(gt);
		if (ret)
		return ret;

		gt->last_init_time = ktime_get();

		/* Double layer security blanket, see i915_gem_init() */

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

+14 −17

Original line number	Diff line number	Diff line
		@@ -126,17 +126,7 @@ static bool reset_engines(struct intel_gt *gt)
		return __intel_gt_reset(gt, ALL_ENGINES) == 0;
		}

		/**
		* intel_gt_sanitize: called after the GPU has lost power
		* @gt: the i915 GT container
		* @force: ignore a failed reset and sanitize engine state anyway
		*
		* Anytime we reset the GPU, either with an explicit GPU reset or through a
		* PCI power cycle, the GPU loses state and we must reset our state tracking
		* to match. Note that calling intel_gt_sanitize() if the GPU has not
		* been reset results in much confusion!
		*/
		void intel_gt_sanitize(struct intel_gt *gt, bool force)
		static void gt_sanitize(struct intel_gt *gt, bool force)
		{
		struct intel_engine_cs *engine;
		enum intel_engine_id id;
		@@ -189,6 +179,10 @@ int intel_gt_resume(struct intel_gt *gt)
		enum intel_engine_id id;
		int err;

		err = intel_gt_terminally_wedged(gt);
		if (err)
		return err;

		GT_TRACE(gt, "\n");

		/*
		@@ -201,14 +195,14 @@ int intel_gt_resume(struct intel_gt *gt)

		intel_uncore_forcewake_get(gt->uncore, FORCEWAKE_ALL);
		intel_rc6_sanitize(&gt->rc6);
		gt_sanitize(gt, true);

		/* Only when the HW is re-initialised, can we replay the requests */
		err = intel_gt_init_hw(gt);
		if (err) {
		dev_err(gt->i915->drm.dev,
		"Failed to initialize GPU, declaring it wedged!\n");
		intel_gt_set_wedged(gt);
		goto err_fw;
		goto err_wedged;
		}

		intel_rps_enable(&gt->rps);
		@@ -233,7 +227,7 @@ int intel_gt_resume(struct intel_gt *gt)
		dev_err(gt->i915->drm.dev,
		"Failed to restart %s (%d)\n",
		engine->name, err);
		break;
		goto err_wedged;
		}
		}

		@@ -243,11 +237,14 @@ int intel_gt_resume(struct intel_gt *gt)

		user_forcewake(gt, false);

		err_fw:
		out_fw:
		intel_uncore_forcewake_put(gt->uncore, FORCEWAKE_ALL);
		intel_gt_pm_put(gt);

		return err;

		err_wedged:
		intel_gt_set_wedged(gt);
		goto out_fw;
		}

		static void wait_for_suspend(struct intel_gt *gt)
		@@ -315,7 +312,7 @@ void intel_gt_suspend_late(struct intel_gt *gt)
		intel_llc_disable(&gt->llc);
		}

		intel_gt_sanitize(gt, false);
		gt_sanitize(gt, false);

		GT_TRACE(gt, "\n");
		}

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -51,8 +51,6 @@ void intel_gt_pm_init_early(struct intel_gt *gt);
		void intel_gt_pm_init(struct intel_gt *gt);
		void intel_gt_pm_fini(struct intel_gt *gt);

		void intel_gt_sanitize(struct intel_gt *gt, bool force);

		void intel_gt_suspend_prepare(struct intel_gt *gt);
		void intel_gt_suspend_late(struct intel_gt *gt);
		int intel_gt_resume(struct intel_gt *gt);

drivers/gpu/drm/i915/i915_drv.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1817,8 +1817,6 @@ static int i915_drm_resume(struct drm_device *dev)

		disable_rpm_wakeref_asserts(&dev_priv->runtime_pm);

		intel_gt_sanitize(&dev_priv->gt, true);

		ret = i915_ggtt_enable_hw(dev_priv);
		if (ret)
		DRM_ERROR("failed to re-enable GGTT\n");

drivers/gpu/drm/i915/selftests/i915_gem.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -124,8 +124,6 @@ static void pm_resume(struct drm_i915_private *i915)
		* that runtime-pm just works.
		*/
		with_intel_runtime_pm(&i915->runtime_pm, wakeref) {
		intel_gt_sanitize(&i915->gt, false);

		i915_gem_restore_gtt_mappings(i915);
		i915_gem_restore_fences(&i915->ggtt);

Admin message