Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 135bafa5 authored by Mika Kuoppala's avatar Mika Kuoppala Committed by Mika Kuoppala
Browse files

drm/i915: Move residency calculation into intel_pm.c 



Plan is to make generic residency calculation utility
function for usage outside of sysfs. As a first step
move residency calculation into intel_pm.c

Signed-off-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 15c344f4

drivers/gpu/drm/i915/i915_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -3879,6 +3879,8 @@ void vlv_phy_reset_lanes(struct intel_encoder *encoder); 


int intel_gpu_freq(struct drm_i915_private *dev_priv, int val);

int intel_freq_opcode(struct drm_i915_private *dev_priv, int val);

u32 intel_rc6_residency(struct drm_i915_private *dev_priv,

			i915_reg_t reg);



#define I915_READ8(reg)		dev_priv->uncore.funcs.mmio_readb(dev_priv, (reg), true)

#define I915_WRITE8(reg, val)	dev_priv->uncore.funcs.mmio_writeb(dev_priv, (reg), (val), true)

drivers/gpu/drm/i915/i915_sysfs.c

+1 −26
Original line number Diff line number Diff line
@@ -42,32 +42,7 @@ static inline struct drm_i915_private *kdev_minor_to_i915(struct device *kdev) 
static u32 calc_residency(struct drm_i915_private *dev_priv,

			  i915_reg_t reg)

{

	u64 raw_time; /* 32b value may overflow during fixed point math */

	u64 units = 128ULL, div = 100000ULL;

	u32 ret;



	if (!intel_enable_rc6())

		return 0;



	intel_runtime_pm_get(dev_priv);



	/* On VLV and CHV, residency time is in CZ units rather than 1.28us */

	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {

		units = 1;

		div = dev_priv->czclk_freq;



		if (I915_READ(VLV_COUNTER_CONTROL) & VLV_COUNT_RANGE_HIGH)

			units <<= 8;

	} else if (IS_GEN9_LP(dev_priv)) {

		units = 1;

		div = 1200;		/* 833.33ns */

	}



	raw_time = I915_READ(reg) * units;

	ret = DIV_ROUND_UP_ULL(raw_time, div);



	intel_runtime_pm_put(dev_priv);

	return ret;

	return intel_rc6_residency(dev_priv, reg);

}



static ssize_t

drivers/gpu/drm/i915/intel_pm.c

+31 −0
Original line number Diff line number Diff line
@@ -8349,3 +8349,34 @@ void intel_pm_setup(struct drm_i915_private *dev_priv) 
	dev_priv->pm.suspended = false;

	atomic_set(&dev_priv->pm.wakeref_count, 0);

}



u32 intel_rc6_residency(struct drm_i915_private *dev_priv,

			i915_reg_t reg)

{

	u64 raw_time; /* 32b value may overflow during fixed point math */

	u64 units = 128ULL, div = 100000ULL;

	u32 ret;



	if (!intel_enable_rc6())

		return 0;



	intel_runtime_pm_get(dev_priv);



	/* On VLV and CHV, residency time is in CZ units rather than 1.28us */

	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {

		units = 1;

		div = dev_priv->czclk_freq;



		if (I915_READ(VLV_COUNTER_CONTROL) & VLV_COUNT_RANGE_HIGH)

			units <<= 8;

	} else if (IS_GEN9_LP(dev_priv)) {

		units = 1;

		div = 1200;		/* 833.33ns */

	}



	raw_time = I915_READ(reg) * units;

	ret = DIV_ROUND_UP_ULL(raw_time, div);



	intel_runtime_pm_put(dev_priv);

	return ret;

}