drm/i915/gt: Move user_forcewake application to GT (d4033a9b) · Commits · 戴 / test

drivers/gpu/drm/i915/gem/i915_gem_pm.c

+0 −22

Original line number	Original line	Diff line number	Diff line
	@@ -11,24 +11,6 @@

	#include "i915_drv.h"		#include "i915_drv.h"

	static void user_forcewake(struct intel_gt *gt, bool suspend)
	{
	int count = atomic_read(&gt->user_wakeref);

	/* Inside suspend/resume so single threaded, no races to worry about. */
	if (likely(!count))
	return;

	intel_gt_pm_get(gt);
	if (suspend) {
	GEM_BUG_ON(count > atomic_read(&gt->wakeref.count));
	atomic_sub(count, &gt->wakeref.count);
	} else {
	atomic_add(count, &gt->wakeref.count);
	}
	intel_gt_pm_put(gt);
	}

	void i915_gem_suspend(struct drm_i915_private *i915)		void i915_gem_suspend(struct drm_i915_private *i915)
	{		{
	GEM_TRACE("\n");		GEM_TRACE("\n");
	@@ -36,8 +18,6 @@ void i915_gem_suspend(struct drm_i915_private *i915)
	intel_wakeref_auto(&i915->ggtt.userfault_wakeref, 0);		intel_wakeref_auto(&i915->ggtt.userfault_wakeref, 0);
	flush_workqueue(i915->wq);		flush_workqueue(i915->wq);

	user_forcewake(&i915->gt, true);

	/*		/*
	* We have to flush all the executing contexts to main memory so		* We have to flush all the executing contexts to main memory so
	* that they can saved in the hibernation image. To ensure the last		* that they can saved in the hibernation image. To ensure the last
	@@ -132,8 +112,6 @@ void i915_gem_resume(struct drm_i915_private *i915)
	if (intel_gt_resume(&i915->gt))		if (intel_gt_resume(&i915->gt))
	goto err_wedged;		goto err_wedged;

	user_forcewake(&i915->gt, false);

	out_unlock:		out_unlock:
	intel_uncore_forcewake_put(&i915->uncore, FORCEWAKE_ALL);		intel_uncore_forcewake_put(&i915->uncore, FORCEWAKE_ALL);
	return;		return;

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

+22 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,24 @@
	#include "intel_rps.h"		#include "intel_rps.h"
	#include "intel_wakeref.h"		#include "intel_wakeref.h"

			static void user_forcewake(struct intel_gt *gt, bool suspend)
			{
			int count = atomic_read(&gt->user_wakeref);

			/* Inside suspend/resume so single threaded, no races to worry about. */
			if (likely(!count))
			return;

			intel_gt_pm_get(gt);
			if (suspend) {
			GEM_BUG_ON(count > atomic_read(&gt->wakeref.count));
			atomic_sub(count, &gt->wakeref.count);
			} else {
			atomic_add(count, &gt->wakeref.count);
			}
			intel_gt_pm_put(gt);
			}

	static int __gt_unpark(struct intel_wakeref *wf)		static int __gt_unpark(struct intel_wakeref *wf)
	{		{
	struct intel_gt gt = container_of(wf, typeof(gt), wakeref);		struct intel_gt gt = container_of(wf, typeof(gt), wakeref);
	@@ -210,6 +228,8 @@ int intel_gt_resume(struct intel_gt *gt)

	intel_uc_resume(&gt->uc);		intel_uc_resume(&gt->uc);

			user_forcewake(gt, false);

	intel_uncore_forcewake_put(gt->uncore, FORCEWAKE_ALL);		intel_uncore_forcewake_put(gt->uncore, FORCEWAKE_ALL);
	intel_gt_pm_put(gt);		intel_gt_pm_put(gt);

	@@ -233,6 +253,8 @@ void intel_gt_suspend(struct intel_gt *gt)
	{		{
	intel_wakeref_t wakeref;		intel_wakeref_t wakeref;

			user_forcewake(gt, true);

	/* We expect to be idle already; but also want to be independent */		/* We expect to be idle already; but also want to be independent */
	wait_for_idle(gt);		wait_for_idle(gt);

Admin message