Commit 3b4ed2e2 authored by Vincent Guittot's avatar Vincent Guittot Committed by Rafael J. Wysocki
Browse files

drm/i915: Move on the new pm runtime interface 



Use the new PM-runtime interface to get the accounted suspended time:
pm_runtime_suspended_time().

This new interface helps to simplify and cleanup the code that computes
__I915_SAMPLE_RC6_ESTIMATED and to remove direct access to internals of
PM-runtime.

Signed-off-by: default avatarVincent Guittot <vincent.guittot@linaro.org>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 8a62ffe2

drivers/gpu/drm/i915/i915_pmu.c

+6 −10
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 */



#include <linux/irq.h>

#include <linux/pm_runtime.h>

#include "i915_pmu.h"

#include "intel_ringbuffer.h"

#include "i915_drv.h"
@@ -478,7 +479,6 @@ static u64 get_rc6(struct drm_i915_private *i915) 
		 * counter value.

		 */

		spin_lock_irqsave(&i915->pmu.lock, flags);

		spin_lock(&kdev->power.lock);



		/*

		 * After the above branch intel_runtime_pm_get_if_in_use failed
@@ -491,16 +491,13 @@ static u64 get_rc6(struct drm_i915_private *i915) 
		 * suspended and if not we cannot do better than report the last

		 * known RC6 value.

		 */

		if (kdev->power.runtime_status == RPM_SUSPENDED) {

			if (!i915->pmu.sample[__I915_SAMPLE_RC6_ESTIMATED].cur)

				i915->pmu.suspended_jiffies_last =

						  kdev->power.suspended_jiffies;

		if (pm_runtime_status_suspended(kdev)) {

			val = pm_runtime_suspended_time(kdev);



			val = kdev->power.suspended_jiffies -

			      i915->pmu.suspended_jiffies_last;

			val += jiffies - kdev->power.accounting_timestamp;

			if (!i915->pmu.sample[__I915_SAMPLE_RC6_ESTIMATED].cur)

				i915->pmu.suspended_time_last = val;



			val = jiffies_to_nsecs(val);

			val -= i915->pmu.suspended_time_last;

			val += i915->pmu.sample[__I915_SAMPLE_RC6].cur;



			i915->pmu.sample[__I915_SAMPLE_RC6_ESTIMATED].cur = val;
@@ -510,7 +507,6 @@ static u64 get_rc6(struct drm_i915_private *i915) 
			val = i915->pmu.sample[__I915_SAMPLE_RC6].cur;

		}



		spin_unlock(&kdev->power.lock);

		spin_unlock_irqrestore(&i915->pmu.lock, flags);

	}

drivers/gpu/drm/i915/i915_pmu.h

+2 −2
Original line number Diff line number Diff line
@@ -95,9 +95,9 @@ struct i915_pmu { 
	 */

	struct i915_pmu_sample sample[__I915_NUM_PMU_SAMPLERS];

	/**

	 * @suspended_jiffies_last: Cached suspend time from PM core.

	 * @suspended_time_last: Cached suspend time from PM core.

	 */

	unsigned long suspended_jiffies_last;

	u64 suspended_time_last;

	/**

	 * @i915_attr: Memory block holding device attributes.

	 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE