[igt-dev] [PATCH i-g-t 2/2] lib/psr: Add support to new modified i915_edp_psr_status output

José Roberto de Souza
2018-10-04T20:59:48Z

The kernel patch 'drm/i915: Refactor PSR status debugfs' changed the
output of i915_edp_psr_status, so adding support to the new output
here while keeping the support to the old one for a while.

Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
---
lib/igt_psr.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/igt_psr.c b/lib/igt_psr.c
index f36496fd..a48c9232 100644
--- a/lib/igt_psr.c
+++ b/lib/igt_psr.c
@@ -32,8 +32,10 @@ static bool psr_active(int debugfs_fd, bool check_active)

igt_debugfs_simple_read(debugfs_fd, "i915_edp_psr_status", buf,
sizeof(buf));
- active = strstr(buf, "HW Enabled & Active bit: yes\n") &&
- (strstr(buf, "SRDENT") || strstr(buf, "SLEEP"));
+
+ active = (strstr(buf, "HW Enabled & Active bit: yes\n") ||
+ strstr(buf, "Source PSR ctl: enabled")) &&
+ (strstr(buf, "SRDENT") || strstr(buf, "SLEEP"));
return check_active ? active : !active;
}

@@ -136,5 +138,6 @@ bool psr_supported(int debugfs_fd)

igt_debugfs_simple_read(debugfs_fd, "i915_edp_psr_status", buf,
sizeof(buf));
- return strstr(buf, "Sink_Support: yes\n");
+ return strstr(buf, "Sink_Support: yes\n") ||
+ strstr(buf, "Sink support: yes");
}
--
2.19.0