drm/i915/gt: Pull restoration of GGTT fences underneath the GT (dec9cf9e) · Commits · 戴 / test

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -1195,6 +1195,8 @@ void i915_ggtt_resume(struct i915_ggtt *ggtt)

		if (INTEL_GEN(ggtt->vm.i915) >= 8)
		setup_private_pat(ggtt->vm.gt->uncore);

		intel_ggtt_restore_fences(ggtt);
		}

		static struct scatterlist *

+1 −0

Original line number	Diff line number	Diff line
		@@ -324,6 +324,7 @@ int intel_gt_runtime_resume(struct intel_gt *gt)
		{
		GT_TRACE(gt, "\n");
		intel_gt_init_swizzling(gt);
		intel_ggtt_restore_fences(gt->ggtt);

		return intel_uc_runtime_resume(&gt->uc);
		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -1288,7 +1288,6 @@ static int i915_drm_resume(struct drm_device *dev)
		drm_err(&dev_priv->drm, "failed to re-enable GGTT\n");

		i915_ggtt_resume(&dev_priv->ggtt);
		intel_ggtt_restore_fences(&dev_priv->ggtt);

		intel_csr_ucode_resume(dev_priv);

		@@ -1606,8 +1605,6 @@ static int intel_runtime_suspend(struct device *kdev)

		intel_gt_runtime_resume(&dev_priv->gt);

		intel_ggtt_restore_fences(&dev_priv->ggtt);

		enable_rpm_wakeref_asserts(rpm);

		return ret;
		@@ -1687,7 +1684,6 @@ static int intel_runtime_resume(struct device *kdev)
		* we can do is to hope that things will still work (and disable RPM).
		*/
		intel_gt_runtime_resume(&dev_priv->gt);
		intel_ggtt_restore_fences(&dev_priv->ggtt);

		/*
		* On VLV/CHV display interrupts are part of the display

+0 −1

Original line number	Diff line number	Diff line
		@@ -1156,7 +1156,6 @@ err_unlock:
		/* Minimal basic recovery for KMS */
		ret = i915_ggtt_enable_hw(dev_priv);
		i915_ggtt_resume(&dev_priv->ggtt);
		intel_ggtt_restore_fences(&dev_priv->ggtt);
		intel_init_clock_gating(dev_priv);
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -125,8 +125,6 @@ static void pm_resume(struct drm_i915_private *i915)
		*/
		with_intel_runtime_pm(&i915->runtime_pm, wakeref) {
		i915_ggtt_resume(&i915->ggtt);
		intel_ggtt_restore_fences(&i915->ggtt);

		i915_gem_resume(i915);
		}
		}