Attachment 92540 Details for Bug 70254 – Patch to allow changing watermark latency values

[patch] Patch to allow changing watermark latency values

0001-drm-i915-Add-debugfs-hooks-for-messign-with-watermar.patch (text/plain), 5.47 KB, created by Ville Syrjala on 2014-01-21 19:45:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Syrjala

Created: 2014-01-21 19:45:15 UTC

Size: 5.47 KB

patch

obsolete

>From 7621237e4bdd822f8afcf6113c849d83f8fba3b1 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
>Date: Tue, 21 Jan 2014 19:46:15 +0200
>Subject: [PATCH] drm/i915: Add debugfs hooks for messign with watermark
> latencies
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Add a few new debugfs files which allow changing the watermark memory
>latency values during runtime. This can be used to determine the if the
>original BIOS provided latency values are no good.
>
>Signed-off-by: Ville SyrjÃ¤lÃ¤ <ville.syrjala@linux.intel.com>
>---
> drivers/gpu/drm/i915/i915_debugfs.c | 165 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 165 insertions(+)
>
>diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
>index 473dda2..58febeb 100644
>--- a/drivers/gpu/drm/i915/i915_debugfs.c
>+++ b/drivers/gpu/drm/i915/i915_debugfs.c
>@@ -2784,6 +2784,168 @@ static const struct file_operations i915_display_crc_ctl_fops = {
> 	.write = display_crc_ctl_write
> };
> 
>+static void wm_latency_show(struct seq_file *m,
>+			    const char *name, const uint16_t wm[5])
>+{
>+	struct drm_device *dev = m->private;
>+	int num_levels = IS_HASWELL(dev) || IS_BROADWELL(dev) ? 5 : 4;
>+	int level;
>+
>+	for (level = 0; level < num_levels; level++) {
>+		unsigned int latency = wm[level];
>+
>+		/* WM1+ latency values in 0.5us units */
>+		if (level > 0)
>+			latency *= 5;
>+
>+		seq_printf(m, "%s WM%d %u (%u.%u usec)\n",
>+			   name, level, wm[level],
>+			   latency / 10, latency % 10);
>+	}
>+}
>+
>+static int pri_wm_latency_show(struct seq_file *m, void *data)
>+{
>+	struct drm_device *dev = m->private;
>+
>+	wm_latency_show(m, "Primary", to_i915(dev)->wm.pri_latency);
>+
>+	return 0;
>+}
>+
>+static int spr_wm_latency_show(struct seq_file *m, void *data)
>+{
>+	struct drm_device *dev = m->private;
>+
>+	wm_latency_show(m, "Sprite", to_i915(dev)->wm.spr_latency);
>+
>+	return 0;
>+}
>+
>+static int cur_wm_latency_show(struct seq_file *m, void *data)
>+{
>+	struct drm_device *dev = m->private;
>+
>+	wm_latency_show(m, "Cursor", to_i915(dev)->wm.cur_latency);
>+
>+	return 0;
>+}
>+
>+static int pri_wm_latency_open(struct inode *inode, struct file *file)
>+{
>+	struct drm_device *dev = inode->i_private;
>+
>+	if (!HAS_PCH_SPLIT(dev))
>+		return -ENODEV;
>+
>+	return single_open(file, pri_wm_latency_show, dev);
>+}
>+
>+static int spr_wm_latency_open(struct inode *inode, struct file *file)
>+{
>+	struct drm_device *dev = inode->i_private;
>+
>+	if (!HAS_PCH_SPLIT(dev))
>+		return -ENODEV;
>+
>+	return single_open(file, spr_wm_latency_show, dev);
>+}
>+
>+static int cur_wm_latency_open(struct inode *inode, struct file *file)
>+{
>+	struct drm_device *dev = inode->i_private;
>+
>+	if (!HAS_PCH_SPLIT(dev))
>+		return -ENODEV;
>+
>+	return single_open(file, cur_wm_latency_show, dev);
>+}
>+
>+static ssize_t wm_latency_write(struct file *file, const char __user *ubuf,
>+				size_t len, loff_t *offp,
>+				uint16_t wm[5])
>+{
>+	struct seq_file *m = file->private_data;
>+	struct drm_device *dev = m->private;
>+	uint16_t new[5] = { 0 };
>+	int num_levels = IS_HASWELL(dev) || IS_BROADWELL(dev) ? 5 : 4;
>+	int level;
>+	int ret;
>+	char tmp[32];
>+
>+	if (len >= sizeof(tmp))
>+		return -EINVAL;
>+
>+	if (copy_from_user(tmp, ubuf, len))
>+		return -EFAULT;
>+
>+	tmp[len] = '\0';
>+
>+	ret = sscanf(tmp, "%hu %hu %hu %hu %hu", &new[0], &new[1], &new[2], &new[3], &new[4]);
>+	if (ret != num_levels)
>+		return -EINVAL;
>+
>+	for (level = 0; level < num_levels; level++)
>+		wm[level] = new[level];
>+
>+	return len;
>+}
>+
>+
>+static ssize_t pri_wm_latency_write(struct file *file, const char __user *ubuf,
>+				    size_t len, loff_t *offp)
>+{
>+	struct seq_file *m = file->private_data;
>+	struct drm_device *dev = m->private;
>+
>+	return wm_latency_write(file, ubuf, len, offp, to_i915(dev)->wm.pri_latency);
>+}
>+
>+static ssize_t spr_wm_latency_write(struct file *file, const char __user *ubuf,
>+				    size_t len, loff_t *offp)
>+{
>+	struct seq_file *m = file->private_data;
>+	struct drm_device *dev = m->private;
>+
>+	return wm_latency_write(file, ubuf, len, offp, to_i915(dev)->wm.spr_latency);
>+}
>+
>+static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf,
>+				    size_t len, loff_t *offp)
>+{
>+	struct seq_file *m = file->private_data;
>+	struct drm_device *dev = m->private;
>+
>+	return wm_latency_write(file, ubuf, len, offp, to_i915(dev)->wm.cur_latency);
>+}
>+
>+static const struct file_operations i915_pri_wm_latency_fops = {
>+	.owner = THIS_MODULE,
>+	.open = pri_wm_latency_open,
>+	.read = seq_read,
>+	.llseek = seq_lseek,
>+	.release = single_release,
>+	.write = pri_wm_latency_write
>+};
>+
>+static const struct file_operations i915_spr_wm_latency_fops = {
>+	.owner = THIS_MODULE,
>+	.open = spr_wm_latency_open,
>+	.read = seq_read,
>+	.llseek = seq_lseek,
>+	.release = single_release,
>+	.write = spr_wm_latency_write
>+};
>+
>+static const struct file_operations i915_cur_wm_latency_fops = {
>+	.owner = THIS_MODULE,
>+	.open = cur_wm_latency_open,
>+	.read = seq_read,
>+	.llseek = seq_lseek,
>+	.release = single_release,
>+	.write = cur_wm_latency_write
>+};
>+
> static int
> i915_wedged_get(void *data, u64 *val)
> {
>@@ -3297,6 +3459,9 @@ static const struct i915_debugfs_files {
> 	{"i915_error_state", &i915_error_state_fops},
> 	{"i915_next_seqno", &i915_next_seqno_fops},
> 	{"i915_display_crc_ctl", &i915_display_crc_ctl_fops},
>+	{"i915_pri_wm_latency", &i915_pri_wm_latency_fops},
>+	{"i915_spr_wm_latency", &i915_spr_wm_latency_fops},
>+	{"i915_cur_wm_latency", &i915_cur_wm_latency_fops},
> };
> 
> void intel_display_crc_init(struct drm_device *dev)
>-- 
>1.8.3.2
>

Actions: View | Splinter Review

Attachments on bug 70254: 87256 | 87257 | 91827 | 92058 | 92059 | 92060 | 92061 | 92062 | 92063 | 92540 | 94766

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.