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

Commit 7466c291 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Show RPS autotuning thresholds along with waitboost 



For convenience when debugging user issues show the autotuning
RPS parameters in debugfs/i915_rps_boost_info.

v2: Refine the presentation
v3: Style

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: fritsch@kodi.tv
Link: http://patchwork.freedesktop.org/patch/msgid/1471181336-27523-1-git-send-email-chris@chris-wilson.co.uk


Reviewed-by: default avatarDavid Weinehall <david.weinehall@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1471250973-31277-1-git-send-email-chris@chris-wilson.co.uk
parent cc926387

drivers/gpu/drm/i915/i915_debugfs.c

+46 −2
Original line number Original line Diff line number Diff line
@@ -2441,6 +2441,20 @@ static int count_irq_waiters(struct drm_i915_private *i915) 
	return count;

	return count;

}

}





static const char *rps_power_to_str(unsigned int power)

{

	static const char * const strings[] = {

		[LOW_POWER] = "low power",

		[BETWEEN] = "mixed",

		[HIGH_POWER] = "high power",

	};



	if (power >= ARRAY_SIZE(strings) || !strings[power])

		return "unknown";



	return strings[power];

}



static int i915_rps_boost_info(struct seq_file *m, void *data)

static int i915_rps_boost_info(struct seq_file *m, void *data)

{

{

	struct drm_info_node *node = m->private;

	struct drm_info_node *node = m->private;
@@ -2452,12 +2466,17 @@ static int i915_rps_boost_info(struct seq_file *m, void *data) 
	seq_printf(m, "GPU busy? %s [%x]\n",

	seq_printf(m, "GPU busy? %s [%x]\n",

		   yesno(dev_priv->gt.awake), dev_priv->gt.active_engines);

		   yesno(dev_priv->gt.awake), dev_priv->gt.active_engines);

	seq_printf(m, "CPU waiting? %d\n", count_irq_waiters(dev_priv));

	seq_printf(m, "CPU waiting? %d\n", count_irq_waiters(dev_priv));

	seq_printf(m, "Frequency requested %d; min hard:%d, soft:%d; max soft:%d, hard:%d\n",

	seq_printf(m, "Frequency requested %d\n",

		   intel_gpu_freq(dev_priv, dev_priv->rps.cur_freq),

		   intel_gpu_freq(dev_priv, dev_priv->rps.cur_freq));

	seq_printf(m, "  min hard:%d, soft:%d; max soft:%d, hard:%d\n",

		   intel_gpu_freq(dev_priv, dev_priv->rps.min_freq),

		   intel_gpu_freq(dev_priv, dev_priv->rps.min_freq),

		   intel_gpu_freq(dev_priv, dev_priv->rps.min_freq_softlimit),

		   intel_gpu_freq(dev_priv, dev_priv->rps.min_freq_softlimit),

		   intel_gpu_freq(dev_priv, dev_priv->rps.max_freq_softlimit),

		   intel_gpu_freq(dev_priv, dev_priv->rps.max_freq_softlimit),

		   intel_gpu_freq(dev_priv, dev_priv->rps.max_freq));

		   intel_gpu_freq(dev_priv, dev_priv->rps.max_freq));

	seq_printf(m, "  idle:%d, efficient:%d, boost:%d\n",

		   intel_gpu_freq(dev_priv, dev_priv->rps.idle_freq),

		   intel_gpu_freq(dev_priv, dev_priv->rps.efficient_freq),

		   intel_gpu_freq(dev_priv, dev_priv->rps.boost_freq));





	mutex_lock(&dev->filelist_mutex);

	mutex_lock(&dev->filelist_mutex);

	spin_lock(&dev_priv->rps.client_lock);

	spin_lock(&dev_priv->rps.client_lock);
@@ -2478,6 +2497,31 @@ static int i915_rps_boost_info(struct seq_file *m, void *data) 
	spin_unlock(&dev_priv->rps.client_lock);

	spin_unlock(&dev_priv->rps.client_lock);

	mutex_unlock(&dev->filelist_mutex);

	mutex_unlock(&dev->filelist_mutex);





	if (INTEL_GEN(dev_priv) >= 6 &&

	    dev_priv->rps.enabled &&

	    dev_priv->gt.active_engines) {

		u32 rpup, rpupei;

		u32 rpdown, rpdownei;



		intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);

		rpup = I915_READ_FW(GEN6_RP_CUR_UP) & GEN6_RP_EI_MASK;

		rpupei = I915_READ_FW(GEN6_RP_CUR_UP_EI) & GEN6_RP_EI_MASK;

		rpdown = I915_READ_FW(GEN6_RP_CUR_DOWN) & GEN6_RP_EI_MASK;

		rpdownei = I915_READ_FW(GEN6_RP_CUR_DOWN_EI) & GEN6_RP_EI_MASK;

		intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);



		seq_printf(m, "\nRPS Autotuning (current \"%s\" window):\n",

			   rps_power_to_str(dev_priv->rps.power));

		seq_printf(m, "  Avg. up: %d%% [above threshold? %d%%]\n",

			   100 * rpup / rpupei,

			   dev_priv->rps.up_threshold);

		seq_printf(m, "  Avg. down: %d%% [below threshold? %d%%]\n",

			   100 * rpdown / rpdownei,

			   dev_priv->rps.down_threshold);

	} else {

		seq_puts(m, "\nRPS Autotuning inactive\n");

	}



	return 0;

	return 0;

}

}

drivers/gpu/drm/i915/i915_reg.h

+4 −3
Original line number Original line Diff line number Diff line
@@ -7036,12 +7036,13 @@ enum { 
#define GEN6_RP_UP_THRESHOLD			_MMIO(0xA02C)

#define GEN6_RP_UP_THRESHOLD			_MMIO(0xA02C)

#define GEN6_RP_DOWN_THRESHOLD			_MMIO(0xA030)

#define GEN6_RP_DOWN_THRESHOLD			_MMIO(0xA030)

#define GEN6_RP_CUR_UP_EI			_MMIO(0xA050)

#define GEN6_RP_CUR_UP_EI			_MMIO(0xA050)

#define   GEN6_CURICONT_MASK			0xffffff

#define   GEN6_RP_EI_MASK			0xffffff

#define   GEN6_CURICONT_MASK			GEN6_RP_EI_MASK

#define GEN6_RP_CUR_UP				_MMIO(0xA054)

#define GEN6_RP_CUR_UP				_MMIO(0xA054)

#define   GEN6_CURBSYTAVG_MASK			0xffffff

#define   GEN6_CURBSYTAVG_MASK			GEN6_RP_EI_MASK

#define GEN6_RP_PREV_UP				_MMIO(0xA058)

#define GEN6_RP_PREV_UP				_MMIO(0xA058)

#define GEN6_RP_CUR_DOWN_EI			_MMIO(0xA05C)

#define GEN6_RP_CUR_DOWN_EI			_MMIO(0xA05C)

#define   GEN6_CURIAVG_MASK			0xffffff

#define   GEN6_CURIAVG_MASK			GEN6_RP_EI_MASK

#define GEN6_RP_CUR_DOWN			_MMIO(0xA060)

#define GEN6_RP_CUR_DOWN			_MMIO(0xA060)

#define GEN6_RP_PREV_DOWN			_MMIO(0xA064)

#define GEN6_RP_PREV_DOWN			_MMIO(0xA064)

#define GEN6_RP_UP_EI				_MMIO(0xA068)

#define GEN6_RP_UP_EI				_MMIO(0xA068)