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

Commit b8a5ff8d authored by Jeff McGee's avatar Jeff McGee Committed by Daniel Vetter
Browse files

drm/i915: Update rps interrupt limits 



sysfs changes to rps min and max delay were only triggering an update
of the rps interrupt limits if the active delay required an update.
This change ensures that interrupt limits are always updated.

v2: correct compile issue missed on rebase
v3: add igt testcases to signed-off-by section

Testcase: igt/pm_rps/min-max-config-idle
Testcase: igt/pm_rps/min-max-config-loaded
Signed-off-by: default avatarJeff McGee <jeff.mcgee@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent dd0a1aa1

drivers/gpu/drm/i915/i915_sysfs.c

+10 −0
Original line number Diff line number Diff line
@@ -357,6 +357,11 @@ static ssize_t gt_max_freq_mhz_store(struct device *kdev, 
		else

			gen6_set_rps(dev, val);

	}

	else if (!IS_VALLEYVIEW(dev))

		/* We still need gen6_set_rps to process the new max_delay

		   and update the interrupt limits even though frequency

		   request is unchanged. */

		gen6_set_rps(dev, dev_priv->rps.cur_delay);



	mutex_unlock(&dev_priv->rps.hw_lock);
@@ -426,6 +431,11 @@ static ssize_t gt_min_freq_mhz_store(struct device *kdev, 
		else

			gen6_set_rps(dev, val);

	}

	else if (!IS_VALLEYVIEW(dev))

		/* We still need gen6_set_rps to process the new min_delay

		   and update the interrupt limits even though frequency

		   request is unchanged. */

		gen6_set_rps(dev, dev_priv->rps.cur_delay);



	mutex_unlock(&dev_priv->rps.hw_lock);

drivers/gpu/drm/i915/intel_pm.c

+10 −1
Original line number Diff line number Diff line
@@ -3003,6 +3003,9 @@ static void gen6_set_rps_thresholds(struct drm_i915_private *dev_priv, u8 val) 
	dev_priv->rps.last_adj = 0;

}



/* gen6_set_rps is called to update the frequency request, but should also be

 * called when the range (min_delay and max_delay) is modified so that we can

 * update the GEN6_RP_INTERRUPT_LIMITS register accordingly. */

void gen6_set_rps(struct drm_device *dev, u8 val)

{

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -3011,8 +3014,14 @@ void gen6_set_rps(struct drm_device *dev, u8 val) 
	WARN_ON(val > dev_priv->rps.max_delay);

	WARN_ON(val < dev_priv->rps.min_delay);



	if (val == dev_priv->rps.cur_delay)

	if (val == dev_priv->rps.cur_delay) {

		/* min/max delay may still have been modified so be sure to

		 * write the limits value */

		I915_WRITE(GEN6_RP_INTERRUPT_LIMITS,

			   gen6_rps_limits(dev_priv, val));



		return;

	}



	gen6_set_rps_thresholds(dev_priv, val);