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

Commit c5e0688c authored by Akash Goel's avatar Akash Goel Committed by Daniel Vetter
Browse files

drm/i915/skl: Retrieve the Rpe value from Pcode 



Read the efficient frequency (aka RPe) value through the the mailbox
command (0x1A) from the pcode, as done on Haswell and Broadwell.
The turbo minimum frequency softlimit is not revised as per the
efficient frequency value.

v2: Replaced the conditional expression operator with 'if' statement (Tom)
v3: Corrected the derivation of efficient frequency & shifted the
    GEN9_FREQ_SCALER multiplications downwards (Ville)

Issue: VIZ-5143
Signed-off-by: default avatarAkash Goel <akash.goel@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d04df732

drivers/gpu/drm/i915/intel_pm.c

+11 −8
Original line number Diff line number Diff line
@@ -4703,18 +4703,11 @@ static void gen6_init_rps_frequencies(struct drm_device *dev) 
		dev_priv->rps.min_freq = (rp_state_cap >> 16) & 0xff;

	}



	if (IS_SKYLAKE(dev)) {

		/* Store the frequency values in 16.66 MHZ units, which is

		   the natural hardware unit for SKL */

		dev_priv->rps.rp0_freq *= GEN9_FREQ_SCALER;

		dev_priv->rps.rp1_freq *= GEN9_FREQ_SCALER;

		dev_priv->rps.min_freq *= GEN9_FREQ_SCALER;

	}

	/* hw_max = RP0 until we check for overclocking */

	dev_priv->rps.max_freq		= dev_priv->rps.rp0_freq;



	dev_priv->rps.efficient_freq = dev_priv->rps.rp1_freq;

	if (IS_HASWELL(dev) || IS_BROADWELL(dev)) {

	if (IS_HASWELL(dev) || IS_BROADWELL(dev) || IS_SKYLAKE(dev)) {

		ret = sandybridge_pcode_read(dev_priv,

					HSW_PCODE_DYNAMIC_DUTY_CYCLE_CONTROL,

					&ddcc_status);
@@ -4726,6 +4719,16 @@ static void gen6_init_rps_frequencies(struct drm_device *dev) 
					dev_priv->rps.max_freq);

	}



	if (IS_SKYLAKE(dev)) {

		/* Store the frequency values in 16.66 MHZ units, which is

		   the natural hardware unit for SKL */

		dev_priv->rps.rp0_freq *= GEN9_FREQ_SCALER;

		dev_priv->rps.rp1_freq *= GEN9_FREQ_SCALER;

		dev_priv->rps.min_freq *= GEN9_FREQ_SCALER;

		dev_priv->rps.max_freq *= GEN9_FREQ_SCALER;

		dev_priv->rps.efficient_freq *= GEN9_FREQ_SCALER;

	}



	dev_priv->rps.idle_freq = dev_priv->rps.min_freq;



	/* Preserve min/max settings in case of re-init */