From patchwork Thu Apr 28 01:11:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tom.orourke@intel.com X-Patchwork-Id: 8964661 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BAA23BF29F for ; Thu, 28 Apr 2016 01:11:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B04952025A for ; Thu, 28 Apr 2016 01:11:58 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 841C120219 for ; Thu, 28 Apr 2016 01:11:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E63886E386; Thu, 28 Apr 2016 01:11:52 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 6CA306E396 for ; Thu, 28 Apr 2016 01:11:25 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 27 Apr 2016 18:11:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,544,1455004800"; d="scan'208";a="941742182" Received: from torourke-desk.ra.intel.com (HELO localhost.localdomain) ([10.10.35.157]) by orsmga001.jf.intel.com with ESMTP; 27 Apr 2016 18:11:24 -0700 From: tom.orourke@intel.com To: intel-gfx@lists.freedesktop.org Date: Wed, 27 Apr 2016 18:11:03 -0700 Message-Id: <1461805865-212590-20-git-send-email-tom.orourke@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461805865-212590-1-git-send-email-tom.orourke@intel.com> References: <1461805865-212590-1-git-send-email-tom.orourke@intel.com> Cc: Tom O'Rourke , radoslaw.szwichtenberg@intel.com, paulo.r.zanoni@intel.com Subject: [Intel-gfx] [PATCH 19/21] drm/i915/slpc: Add enable/disable debugfs for slpc X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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, &override_enable, + &value_enable); + intel_slpc_get_param(dev, disable_id, &override_disable, + &value_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, &val, 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 (!strncmp(buf, "enabled", 7)) + val = SLPC_PARAM_TASK_ENABLED; + else if (!strncmp(buf, "disabled", 8)) + val = SLPC_PARAM_TASK_DISABLED; + else + ret = -EINVAL; + } + + if (!ret) + ret = slpc_enable_disable_set(dev, val, enable_id, disable_id); + + return ret; +} + +static int slpc_gtperf_show(struct seq_file *m, void *data) +{ + slpc_param_show(m, SLPC_PARAM_TASK_ENABLE_GTPERF, + SLPC_PARAM_TASK_DISABLE_GTPERF); + + return 0; +} + +static int slpc_gtperf_open(struct inode *inode, struct file *file) +{ + struct drm_connector *dev = inode->i_private; + + return single_open(file, slpc_gtperf_show, dev); +} + +static ssize_t slpc_gtperf_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_GTPERF, + SLPC_PARAM_TASK_DISABLE_GTPERF); + if (ret) + return (size_t) ret; + + return len; +} + +static const struct file_operations i915_slpc_gtperf_fops = { + .owner = THIS_MODULE, + .open = slpc_gtperf_open, + .release = single_release, + .read = seq_read, + .write = slpc_gtperf_write, + .llseek = seq_lseek +}; + +static int slpc_balancer_show(struct seq_file *m, void *data) +{ + slpc_param_show(m, SLPC_PARAM_TASK_ENABLE_BALANCER, + SLPC_PARAM_TASK_DISABLE_BALANCER); + + return 0; +} + +static int slpc_balancer_open(struct inode *inode, struct file *file) +{ + struct drm_connector *dev = inode->i_private; + + return single_open(file, slpc_balancer_show, dev); +} + +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; + + return len; +} + +static const struct file_operations i915_slpc_balancer_fops = { + .owner = THIS_MODULE, + .open = slpc_balancer_open, + .release = single_release, + .read = seq_read, + .write = slpc_balancer_write, + .llseek = seq_lseek +}; + +static int slpc_dcc_show(struct seq_file *m, void *data) +{ + slpc_param_show(m, SLPC_PARAM_TASK_ENABLE_DCC, + SLPC_PARAM_TASK_DISABLE_DCC); + + return 0; +} + +static int slpc_dcc_open(struct inode *inode, struct file *file) +{ + struct drm_connector *dev = inode->i_private; + + return single_open(file, slpc_dcc_show, dev); +} + +static ssize_t slpc_dcc_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_DCC, + SLPC_PARAM_TASK_DISABLE_DCC); + if (ret) + return (size_t) ret; + + return len; +} + +static const struct file_operations i915_slpc_dcc_fops = { + .owner = THIS_MODULE, + .open = slpc_dcc_open, + .release = single_release, + .read = seq_read, + .write = slpc_dcc_write, + .llseek = seq_lseek +}; + static int i915_frequency_info(struct seq_file *m, void *unused) { struct drm_info_node *node = m->private; @@ -5475,6 +5722,9 @@ static const struct i915_debugfs_files { const struct file_operations *fops; } i915_debugfs_files[] = { {"i915_wedged", &i915_wedged_fops}, + {"i915_slpc_gtperf", &i915_slpc_gtperf_fops}, + {"i915_slpc_balancer", &i915_slpc_balancer_fops}, + {"i915_slpc_dcc", &i915_slpc_dcc_fops}, {"i915_max_freq", &i915_max_freq_fops}, {"i915_min_freq", &i915_min_freq_fops}, {"i915_cache_sharing", &i915_cache_sharing_fops}, diff --git a/drivers/gpu/drm/i915/intel_slpc.h b/drivers/gpu/drm/i915/intel_slpc.h index bf09f1b..a7b2be8 100644 --- a/drivers/gpu/drm/i915/intel_slpc.h +++ b/drivers/gpu/drm/i915/intel_slpc.h @@ -89,6 +89,11 @@ enum slpc_param_id { SLPC_PARAM_GLOBAL_DISABE_IA_GT_BALANCING = 16, }; +#define SLPC_PARAM_TASK_DEFAULT 0 +#define SLPC_PARAM_TASK_ENABLED 1 +#define SLPC_PARAM_TASK_DISABLED 2 +#define SLPC_PARAM_TASK_UNKNOWN 3 + enum slpc_global_state { SLPC_GLOBAL_STATE_NOT_RUNNING = 0, SLPC_GLOBAL_STATE_INITIALIZING = 1,