[Intel-gfx] [PATCH 7/7] drm/i915: Add media rc6 residency file to sysfs

[Deepak S]

On Monday 19 January 2015 05:20 PM, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> On VLV/CHV the media well rc6 residency gets reported separately
> from the render well, so add another file to sysfs so that we can
> report the residency to the user.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Looks like we missed Media well completely :) and I think we need igt test to verify media residency?

Reviewed-by: Deepak S<deepak.s at linux.intel.com>

> ---
>   drivers/gpu/drm/i915/i915_sysfs.c | 25 +++++++++++++++++++++++++
>   1 file changed, 25 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
> index 1ca944b..db14d3e 100644
> --- a/drivers/gpu/drm/i915/i915_sysfs.c
> +++ b/drivers/gpu/drm/i915/i915_sysfs.c
> @@ -127,10 +127,19 @@ show_rc6pp_ms(struct device *kdev, struct device_attribute *attr, char *buf)
>   	return snprintf(buf, PAGE_SIZE, "%u\n", rc6pp_residency);
>   }
>   
> +static ssize_t
> +show_media_rc6_ms(struct device *kdev, struct device_attribute *attr, char *buf)
> +{
> +	struct drm_minor *dminor = dev_get_drvdata(kdev);
> +	u32 rc6_residency = calc_residency(dminor->dev, VLV_GT_MEDIA_RC6);
> +	return snprintf(buf, PAGE_SIZE, "%u\n", rc6_residency);
> +}
> +
>   static DEVICE_ATTR(rc6_enable, S_IRUGO, show_rc6_mask, NULL);
>   static DEVICE_ATTR(rc6_residency_ms, S_IRUGO, show_rc6_ms, NULL);
>   static DEVICE_ATTR(rc6p_residency_ms, S_IRUGO, show_rc6p_ms, NULL);
>   static DEVICE_ATTR(rc6pp_residency_ms, S_IRUGO, show_rc6pp_ms, NULL);
> +static DEVICE_ATTR(media_rc6_residency_ms, S_IRUGO, show_media_rc6_ms, NULL);
>   
>   static struct attribute *rc6_attrs[] = {
>   	&dev_attr_rc6_enable.attr,
> @@ -153,6 +162,16 @@ static struct attribute_group rc6p_attr_group = {
>   	.name = power_group_name,
>   	.attrs =  rc6p_attrs
>   };
> +
> +static struct attribute *media_rc6_attrs[] = {
> +	&dev_attr_media_rc6_residency_ms.attr,
> +	NULL
> +};
> +
> +static struct attribute_group media_rc6_attr_group = {
> +	.name = power_group_name,
> +	.attrs =  media_rc6_attrs
> +};
>   #endif
>   
>   static int l3_access_valid(struct drm_device *dev, loff_t offset)
> @@ -612,6 +631,12 @@ void i915_setup_sysfs(struct drm_device *dev)
>   		if (ret)
>   			DRM_ERROR("RC6p residency sysfs setup failed\n");
>   	}
> +	if (IS_VALLEYVIEW(dev)) {
> +		ret = sysfs_merge_group(&dev->primary->kdev->kobj,
> +					&media_rc6_attr_group);
> +		if (ret)
> +			DRM_ERROR("Media RC6 residency sysfs setup failed\n");
> +	}
>   #endif
>   	if (HAS_L3_DPF(dev)) {
>   		ret = device_create_bin_file(dev->primary->kdev, &dpf_attrs);