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

Commit a72b5623 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/915: Fix long lines and random indent in gen6_set_rps_thresholds() 



smatch complains:

	drivers/gpu/drm/i915/intel_pm.c:4745 gen6_set_rps_thresholds() warn:
	inconsistent indenting

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1467470166-31717-2-git-send-email-chris@chris-wilson.co.uk


Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
parent 338d0eea

drivers/gpu/drm/i915/intel_pm.c

+22 −16
Original line number Diff line number Diff line
@@ -4667,19 +4667,23 @@ static void gen6_set_rps_thresholds(struct drm_i915_private *dev_priv, u8 val) 
	new_power = dev_priv->rps.power;

	switch (dev_priv->rps.power) {

	case LOW_POWER:

		if (val > dev_priv->rps.efficient_freq + 1 && val > dev_priv->rps.cur_freq)

		if (val > dev_priv->rps.efficient_freq + 1 &&

		    val > dev_priv->rps.cur_freq)

			new_power = BETWEEN;

		break;



	case BETWEEN:

		if (val <= dev_priv->rps.efficient_freq && val < dev_priv->rps.cur_freq)

		if (val <= dev_priv->rps.efficient_freq &&

		    val < dev_priv->rps.cur_freq)

			new_power = LOW_POWER;

		else if (val >= dev_priv->rps.rp0_freq && val > dev_priv->rps.cur_freq)

		else if (val >= dev_priv->rps.rp0_freq &&

			 val > dev_priv->rps.cur_freq)

			new_power = HIGH_POWER;

		break;



	case HIGH_POWER:

		if (val < (dev_priv->rps.rp1_freq + dev_priv->rps.rp0_freq) >> 1 && val < dev_priv->rps.cur_freq)

		if (val < (dev_priv->rps.rp1_freq + dev_priv->rps.rp0_freq) >> 1 &&

		    val < dev_priv->rps.cur_freq)

			new_power = BETWEEN;

		break;

	}
@@ -4727,12 +4731,14 @@ static void gen6_set_rps_thresholds(struct drm_i915_private *dev_priv, u8 val) 
	I915_WRITE(GEN6_RP_UP_EI,

		   GT_INTERVAL_FROM_US(dev_priv, ei_up));

	I915_WRITE(GEN6_RP_UP_THRESHOLD,

		GT_INTERVAL_FROM_US(dev_priv, (ei_up * threshold_up / 100)));

		   GT_INTERVAL_FROM_US(dev_priv,

				       ei_up * threshold_up / 100));



	I915_WRITE(GEN6_RP_DOWN_EI,

		   GT_INTERVAL_FROM_US(dev_priv, ei_down));

	I915_WRITE(GEN6_RP_DOWN_THRESHOLD,

		GT_INTERVAL_FROM_US(dev_priv, (ei_down * threshold_down / 100)));

		   GT_INTERVAL_FROM_US(dev_priv,

				       ei_down * threshold_down / 100));



	I915_WRITE(GEN6_RP_CONTROL,

		   GEN6_RP_MEDIA_TURBO |