Attachment 83707 Details for Bug 67734 – Expose RPe for vlv in sysfs

[patch] Expose RPe for vlv in sysfs

0001-drm-i915-Adjust-available-RPS-information-through-sy.patch (text/plain), 3.48 KB, created by Chris Wilson on 2013-08-06 09:48:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2013-08-06 09:48:38 UTC

Size: 3.48 KB

patch

obsolete

>From c8d2d07c9e71c2b01e933eb6410816d25a46df39 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Tue, 6 Aug 2013 10:45:35 +0100
>Subject: [PATCH] drm/i915: Adjust available RPS information through sysfs for
> vlv
>
>Valleyview has its own render power state implementation with different
>capability knobs - it has no RP0,RP1,RPn but rather RPe.
>
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/i915_sysfs.c | 36 +++++++++++++++++++++++++++++++-----
> 1 file changed, 31 insertions(+), 5 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
>index a777e7f..c8c4112 100644
>--- a/drivers/gpu/drm/i915/i915_sysfs.c
>+++ b/drivers/gpu/drm/i915/i915_sysfs.c
>@@ -224,6 +224,18 @@ static ssize_t gt_cur_freq_mhz_show(struct device *kdev,
> 	return snprintf(buf, PAGE_SIZE, "%d\n", ret);
> }
> 
>+static ssize_t vlv_rpe_freq_mhz_show(struct device *kdev,
>+				     struct device_attribute *attr, char *buf)
>+{
>+	struct drm_minor *minor = container_of(kdev, struct drm_minor, kdev);
>+	struct drm_device *dev = minor->dev;
>+	struct drm_i915_private *dev_priv = dev->dev_private;
>+
>+	return snprintf(buf, PAGE_SIZE, "%d\n",
>+			vlv_gpu_freq(dev_priv->mem_freq,
>+				     dev_priv->rps.rpe_delay));
>+}
>+
> static ssize_t gt_max_freq_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf)
> {
> 	struct drm_minor *minor = container_of(kdev, struct drm_minor, kdev);
>@@ -366,6 +378,7 @@ static DEVICE_ATTR(gt_cur_freq_mhz, S_IRUGO, gt_cur_freq_mhz_show, NULL);
> static DEVICE_ATTR(gt_max_freq_mhz, S_IRUGO | S_IWUSR, gt_max_freq_mhz_show, gt_max_freq_mhz_store);
> static DEVICE_ATTR(gt_min_freq_mhz, S_IRUGO | S_IWUSR, gt_min_freq_mhz_show, gt_min_freq_mhz_store);
> 
>+static DEVICE_ATTR(vlv_rpe_freq_mhz, S_IRUGO, vlv_rpe_freq_mhz_show, NULL);
> 
> static ssize_t gt_rp_mhz_show(struct device *kdev, struct device_attribute *attr, char *buf);
> static DEVICE_ATTR(gt_RP0_freq_mhz, S_IRUGO, gt_rp_mhz_show, NULL);
>@@ -409,6 +422,14 @@ static const struct attribute *gen6_attrs[] = {
> 	NULL,
> };
> 
>+static const struct attribute *vlv_attrs[] = {
>+	&dev_attr_gt_cur_freq_mhz.attr,
>+	&dev_attr_gt_max_freq_mhz.attr,
>+	&dev_attr_gt_min_freq_mhz.attr,
>+	&dev_attr_vlv_rpe_freq_mhz.attr,
>+	NULL,
>+};
>+
> static ssize_t error_state_read(struct file *filp, struct kobject *kobj,
> 				struct bin_attribute *attr, char *buf,
> 				loff_t off, size_t count)
>@@ -492,11 +513,13 @@ void i915_setup_sysfs(struct drm_device *dev)
> 			DRM_ERROR("l3 parity sysfs setup failed\n");
> 	}
> 
>-	if (INTEL_INFO(dev)->gen >= 6) {
>+	ret = 0;
>+	if (IS_VALLEYVIEW(dev))
>+		ret = sysfs_create_files(&dev->primary->kdev.kobj, vlv_attrs);
>+	else if (INTEL_INFO(dev)->gen >= 6)
> 		ret = sysfs_create_files(&dev->primary->kdev.kobj, gen6_attrs);
>-		if (ret)
>-			DRM_ERROR("gen6 sysfs setup failed\n");
>-	}
>+	if (ret)
>+		DRM_ERROR("RPS sysfs setup failed\n");
> 
> 	ret = sysfs_create_bin_file(&dev->primary->kdev.kobj,
> 				    &error_state_attr);
>@@ -507,7 +530,10 @@ void i915_setup_sysfs(struct drm_device *dev)
> void i915_teardown_sysfs(struct drm_device *dev)
> {
> 	sysfs_remove_bin_file(&dev->primary->kdev.kobj, &error_state_attr);
>-	sysfs_remove_files(&dev->primary->kdev.kobj, gen6_attrs);
>+	if (IS_VALLEYVIEW(dev))
>+		sysfs_remove_files(&dev->primary->kdev.kobj, vlv_attrs);
>+	else
>+		sysfs_remove_files(&dev->primary->kdev.kobj, gen6_attrs);
> 	device_remove_bin_file(&dev->primary->kdev,  &dpf_attrs);
> #ifdef CONFIG_PM
> 	sysfs_unmerge_group(&dev->primary->kdev.kobj, &rc6_attr_group);
>-- 
>1.8.1.2
>

Actions: View | Splinter Review

Attachments on bug 67734: 83707

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.