| Message ID | 1408989525-10175-1-git-send-email-rodrigo.vivi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Aug 25, 2014 at 10:58:44AM -0700, Rodrigo Vivi wrote: > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > --- > tests/pm_psr.c | 27 ++++++++++++++++++++------- > 1 file changed, 20 insertions(+), 7 deletions(-) > > diff --git a/tests/pm_psr.c b/tests/pm_psr.c > index 3ab7e7a..8b92d84 100644 > --- a/tests/pm_psr.c > +++ b/tests/pm_psr.c > @@ -32,6 +32,10 @@ > #include <errno.h> > > #include "drmtest.h" > +#include "intel_chipset.h" > +#include "igt_debugfs.h" > + > +#define HAS_PSR(dev) (IS_HASWELL(dev) | IS_BROADWELL(dev)) I don't like duplicating the HAS_PSR macros in the igt testcases. Instead they should check whether the debugfs file is there and whether PSR is there and skip accordingly. -Daniel > > #define SLEEP_DURATION 5000 // in milliseconds > > @@ -41,22 +45,31 @@ static int get_perf(const char *path) > FILE *file; > char str[4]; > > - file = fopen(path, "r"); > - igt_assert(file); > + file = igt_debugfs_fopen("i915_edp_psr_status", "r"); > + igt_require(file); > > ret = fscanf(file, "Sink_Support: %s\n", str); > igt_skip_on_f(ret == 0, > "i915_edp_psr_status format not supported by this test case\n"); > igt_require(strcmp(str, "yes") == 0); > + > ret = fscanf(file, "Source_OK: %s\n", str); > igt_assert(ret != 0); > - > igt_require(strcmp(str, "yes") == 0); > > ret = fscanf(file, "Enabled: %s\n", str); > igt_assert(ret != 0); > igt_assert(strcmp(str, "yes") == 0); > > + ret = fscanf(file, "Active: %s\n", str); > + igt_assert(ret != 0); > + ret = fscanf(file, "Busy frontbuffer bits: %s\n", str); > + igt_assert(ret != 0); > + ret = fscanf(file, "Re-enable work scheduled: %s\n", str); > + igt_assert(ret != 0); > + ret = fscanf(file, "HW Enabled & Active bit: %s\n", str); > + igt_assert(ret != 0); > + > ret = fscanf(file, "Performance_Counter: %i", &perf); > igt_assert(ret != 0); > > @@ -68,14 +81,14 @@ static int get_perf(const char *path) > > igt_simple_main > { > - int ret, perf1, perf2; > - int device = drm_get_card(); > + int perf1, perf2; > + int drm_fd = drm_open_any(); > + uint32_t devid = intel_get_drm_devid(drm_fd); > char *path; > > igt_skip_on_simulation(); > > - ret = asprintf(&path, "/sys/kernel/debug/dri/%d/i915_edp_psr_status", device); > - igt_assert(ret != -1); > + igt_skip_on(!HAS_PSR(devid)); > > perf1 = get_perf(path); > sleep(SLEEP_DURATION / 1000); > -- > 1.9.3 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/tests/pm_psr.c b/tests/pm_psr.c index 3ab7e7a..8b92d84 100644 --- a/tests/pm_psr.c +++ b/tests/pm_psr.c @@ -32,6 +32,10 @@ #include <errno.h> #include "drmtest.h" +#include "intel_chipset.h" +#include "igt_debugfs.h" + +#define HAS_PSR(dev) (IS_HASWELL(dev) | IS_BROADWELL(dev)) #define SLEEP_DURATION 5000 // in milliseconds @@ -41,22 +45,31 @@ static int get_perf(const char *path) FILE *file; char str[4]; - file = fopen(path, "r"); - igt_assert(file); + file = igt_debugfs_fopen("i915_edp_psr_status", "r"); + igt_require(file); ret = fscanf(file, "Sink_Support: %s\n", str); igt_skip_on_f(ret == 0, "i915_edp_psr_status format not supported by this test case\n"); igt_require(strcmp(str, "yes") == 0); + ret = fscanf(file, "Source_OK: %s\n", str); igt_assert(ret != 0); - igt_require(strcmp(str, "yes") == 0); ret = fscanf(file, "Enabled: %s\n", str); igt_assert(ret != 0); igt_assert(strcmp(str, "yes") == 0); + ret = fscanf(file, "Active: %s\n", str); + igt_assert(ret != 0); + ret = fscanf(file, "Busy frontbuffer bits: %s\n", str); + igt_assert(ret != 0); + ret = fscanf(file, "Re-enable work scheduled: %s\n", str); + igt_assert(ret != 0); + ret = fscanf(file, "HW Enabled & Active bit: %s\n", str); + igt_assert(ret != 0); + ret = fscanf(file, "Performance_Counter: %i", &perf); igt_assert(ret != 0); @@ -68,14 +81,14 @@ static int get_perf(const char *path) igt_simple_main { - int ret, perf1, perf2; - int device = drm_get_card(); + int perf1, perf2; + int drm_fd = drm_open_any(); + uint32_t devid = intel_get_drm_devid(drm_fd); char *path; igt_skip_on_simulation(); - ret = asprintf(&path, "/sys/kernel/debug/dri/%d/i915_edp_psr_status", device); - igt_assert(ret != -1); + igt_skip_on(!HAS_PSR(devid)); perf1 = get_perf(path); sleep(SLEEP_DURATION / 1000);
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> --- tests/pm_psr.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)