Re: [Intel-gfx] [PATCH 19/21] drm/i915/slpc: Add enable/disable debugfs for slpc

[Chris Wilson]

On Wed, Apr 27, 2016 at 06:11:03PM -0700, tom.orou...@intel.com wrote:
> +static ssize_t slpc_balancer_write(struct file *file, const char __user 
> *ubuf,
> +   size_t len, loff_t *offp)
> +{
> + struct seq_file *m = file->private_data;
> + int ret = 0;
> +
> + ret = slpc_param_write(m, ubuf, len, SLPC_PARAM_TASK_ENABLE_BALANCER,
> +SLPC_PARAM_TASK_DISABLE_BALANCER);
> + if (ret)
> + return (size_t) ret;

(ssize_t)(size_t)(int)

Spot the problem?

return slpc_param_write(file->private_data, ubuf, len,
SLPC_PARAM_TASK_ENABLE_BALANCER,
SLPC_PARAM_TASK_DISABLE_BALANCER);
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 19/21] drm/i915/slpc: Add enable/disable debugfs for slpc

[tom . orourke]

From: Tom O'Rourke 

Adds debugfs hooks for each slpc task.

The enable/disable debugfs files are
i915_slpc_gtperf, i915_slpc_balancer, and i915_slpc_dcc.

Each of these can take the values:
"default", "enabled", or "disabled"

v2: update for SLPC v2015.2.4
dfps and turbo merged and renamed "gtperf"
ibc split out and renamed "balancer"
v3: Avoid magic numbers (Jon Bloomfield)

Signed-off-by: Tom O'Rourke 
---
 drivers/gpu/drm/i915/i915_debugfs.c | 250 
 drivers/gpu/drm/i915/intel_slpc.h   |   5 +
 2 files changed, 255 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c 
b/drivers/gpu/drm/i915/i915_debugfs.c
index f77d32c..8b39a13 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1157,6 +1157,253 @@ DEFINE_SIMPLE_ATTRIBUTE(i915_next_seqno_fops,
i915_next_seqno_get, i915_next_seqno_set,
"0x%llx\n");
 
+static int slpc_enable_disable_get(struct drm_device *dev, u64 *val,
+  enum slpc_param_id enable_id,
+  enum slpc_param_id disable_id)
+{
+   int override_enable, override_disable;
+   u32 value_enable, value_disable;
+   int ret = 0;
+
+   if (!intel_slpc_active(dev)) {
+   ret = -ENODEV;
+   } else if (val) {
+   intel_slpc_get_param(dev, enable_id, _enable,
+_enable);
+   intel_slpc_get_param(dev, disable_id, _disable,
+_disable);
+
+   /* set the output value:
+   * 0: default
+   * 1: enabled
+   * 2: disabled
+   * 3: unknown (should not happen)
+   */
+   if (override_disable && (1 == value_disable))
+   *val = SLPC_PARAM_TASK_DISABLED;
+   else if (override_enable && (1 == value_enable))
+   *val = SLPC_PARAM_TASK_ENABLED;
+   else if (!override_enable && !override_disable)
+   *val = SLPC_PARAM_TASK_DEFAULT;
+   else
+   *val = SLPC_PARAM_TASK_UNKNOWN;
+
+   } else {
+   ret = -EINVAL;
+   }
+
+   return ret;
+}
+
+static int slpc_enable_disable_set(struct drm_device *dev, u64 val,
+  enum slpc_param_id enable_id,
+  enum slpc_param_id disable_id)
+{
+   int ret = 0;
+
+   if (!intel_slpc_active(dev)) {
+   ret = -ENODEV;
+   } else if (SLPC_PARAM_TASK_DEFAULT == val) {
+   /* set default */
+   intel_slpc_unset_param(dev, enable_id);
+   intel_slpc_unset_param(dev, disable_id);
+   } else if (SLPC_PARAM_TASK_ENABLED == val) {
+   /* set enable */
+   intel_slpc_set_param(dev, enable_id, 1);
+   intel_slpc_unset_param(dev, disable_id);
+   } else if (SLPC_PARAM_TASK_DISABLED == val) {
+   /* set disable */
+   intel_slpc_set_param(dev, disable_id, 1);
+   intel_slpc_unset_param(dev, enable_id);
+   } else {
+   ret = -EINVAL;
+   }
+
+   return ret;
+}
+
+static void slpc_param_show(struct seq_file *m, enum slpc_param_id enable_id,
+   enum slpc_param_id disable_id)
+{
+   struct drm_device *dev = m->private;
+   const char *status;
+   u64 val;
+   int ret;
+
+   ret = slpc_enable_disable_get(dev, , enable_id, disable_id);
+
+   if (ret) {
+   seq_printf(m, "error %d\n", ret);
+   } else {
+   switch (val) {
+   case SLPC_PARAM_TASK_DEFAULT:
+   status = "default\n";
+   break;
+
+   case SLPC_PARAM_TASK_ENABLED:
+   status = "enabled\n";
+   break;
+
+   case SLPC_PARAM_TASK_DISABLED:
+   status = "disabled\n";
+   break;
+
+   default:
+   status = "unknown\n";
+   break;
+   }
+
+   seq_puts(m, status);
+   }
+}
+
+static int slpc_param_write(struct seq_file *m, const char __user *ubuf,
+   size_t len, enum slpc_param_id enable_id,
+   enum slpc_param_id disable_id)
+{
+   struct drm_device *dev = m->private;
+   u64 val;
+   int ret = 0;
+   char buf[10];
+
+   if (len >= sizeof(buf))
+   ret = -EINVAL;
+   else if (copy_from_user(buf, ubuf, len))
+   ret = -EFAULT;
+   else
+   buf[len] = '\0';
+
+   if (!ret) {
+   if (!strncmp(buf, "default", 7))
+   val = SLPC_PARAM_TASK_DEFAULT;
+   else if