drm/i915: Add media rc6 residency file to sysfs
Subsystems (2)
PATCH 1/1 drm/i915: Add media rc6 residency file to sysfs
From: Ville Syrjälä <[email protected]>
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.
Testcase: igt/pm_rc6_residency --run-subtest media-rc6-accuracy
--- drivers/gpu/drm/i915/i915_sysfs.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
drivers/gpu/drm/i915/i915_sysfs.c +25 -0
@@ -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)
@@ -627,6 +646,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);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/2 tests/pm_rc6_residency: Fix proper residency calculation
From: Deepak S <[email protected]>
With current code we are not considering the RC6 residency during sysfs read. This is causing test to fail due to incorrect residency_accuracy check This patch consider code time spent for accuracy check
--- tests/pm_rc6_residency.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tests/pm_rc6_residency.c +2 -1
@@ -37,6 +37,7 @@#define SLEEP_DURATION 3000 // in milliseconds#define RC6_FUDGE 900 // in milliseconds +#define CODE_TIME 50 // in microseconfsstatic unsigned int readit (const char *path) {
@@ -102,7 +103,7 @@ static void residency_accuracy(int value[],const char *name_of_rc6_residency)"the GPU is as idle as possible(ie. no X, " "running and running no other tests)\n"); - counter = ((double )value[1 ] - (double )value[0 ]) /(double )SLEEP_DURATION ; + counter = ((double )value[1 ] - (double )value[0 ]) /(double ) (SLEEP_DURATION +CODE_TIME );if ( counter >0.9 ){ counter_result = counter;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 tests/pm_rc6_residency: Add media_rc6_residency_counter subtest
In reply to [email protected]From: Deepak S <[email protected]>
Added new media_rc6_residency_subtest for chv & vlv.
--- tests/pm_rc6_residency.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tests/pm_rc6_residency.c +7 -1
@@ -135,7 +135,7 @@ igt_main {int fd;int devid =0 ; -int rc6[2 ], rc6p[2 ], rc6pp[2 ]; +int rc6[2 ], rc6p[2 ], rc6pp[2 ], media[2 ];igt_skip_on_simulation ();
@@ -146,6 +146,9 @@ igt_mainclose (fd);read_rc6_residency (rc6,"rc6" ); +if (IS_VALLEYVIEW (devid) ||IS_CHERRYVIEW (devid)) +read_rc6_residency (media,"media_rc6" ); +if (IS_GEN6 (devid) ||IS_IVYBRIDGE (devid)) {read_rc6_residency (rc6p,"rc6p" );read_rc6_residency (rc6pp,"rc6pp" );
@@ -154,6 +157,9 @@ igt_main igt_subtest("rc6-accuracy")residency_accuracy (rc6,"rc6" ); + igt_subtest("media-rc6-accuracy") +if (IS_VALLEYVIEW (devid) ||IS_CHERRYVIEW (devid)) +residency_accuracy (media,"media_rc6" ); igt_subtest("rc6p-accuracy") {if (!IS_GEN6 (devid) && !IS_IVYBRIDGE (devid))igt_skip ("This platform doesn't support RC6p\n" );
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] tests/pm_rc6_residency: Add media_rc6_residency_counter subtest
Quoted 5 lines · On Thu, Feb 26, 2015 at 09:10:29PM +0530, [email protected] wrote:
From: Deepak S <[email protected]>
Added new
media_rc6_residency_subtestfor chv & vlv.Signed-off-by Deepak S <[email protected]>
Both igt patches merged, thanks.
-Daniel
Quoted 44 lines
--- tests/pm_rc6_residency.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)tests/pm_rc6_residency.c +7
-1@@ -135,7 +135,7 @@ igt_main {int fd;int devid =0 ; -int rc6[2 ], rc6p[2 ], rc6pp[2 ]; +int rc6[2 ], rc6p[2 ], rc6pp[2 ], media[2 ];igt_skip_on_simulation ();@@ -146,6 +146,9 @@ igt_mainclose (fd);read_rc6_residency (rc6,"rc6" ); +if (IS_VALLEYVIEW (devid) ||IS_CHERRYVIEW (devid)) +read_rc6_residency (media,"media_rc6" ); +if (IS_GEN6 (devid) ||IS_IVYBRIDGE (devid)) {read_rc6_residency (rc6p,"rc6p" );read_rc6_residency (rc6pp,"rc6pp" );@@ -154,6 +157,9 @@ igt_main igt_subtest("rc6-accuracy")residency_accuracy (rc6,"rc6" ); + igt_subtest("media-rc6-accuracy") +if (IS_VALLEYVIEW (devid) ||IS_CHERRYVIEW (devid)) +residency_accuracy (media,"media_rc6" ); igt_subtest("rc6p-accuracy") {if (!IS_GEN6 (devid) && !IS_IVYBRIDGE (devid))igt_skip ("This platform doesn't support RC6p\n" );Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 10 lines · On Thu, Feb 26, 2015 at 09:10:27PM +0530, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
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.
Testcase: igt/pm_rc6_residency --run-subtest media-rc6-accuracy
Reviewed-by Chris Wilson <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>Signed-off-by Deepak S <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 5841 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -1 282/282 281/282
ILK 308/308 308/308
SNB -1 326/326 325/326
IVB 379/379 379/379 BYT 294/294 294/294 HSW 387/387 387/387 BDW -1 316/316 315/316 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied PNV igt_gem_userptr_blits_minor-unsync-normal DMESG_WARN(1)PASS(3) DMESG_WARN(1)PASS(1) *SNB igt_pm_rpm_fences-dpms PASS(3) DMESG_WARN(1)PASS(1) *BDW igt_gem_gtt_hog PASS(15) DMESG_WARN(1)PASS(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx