public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t] lib/igt_psr: Changed psr_set logic to account for older kernels
@ 2018-10-17 21:26 Casey Bowman
  2018-10-17 21:54 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Casey Bowman @ 2018-10-17 21:26 UTC (permalink / raw)
  To: igt-dev; +Cc: Casey Bowman, dhinakaran.pandiyan

Only EINVAL was being used to account for older kernels,
but on legacy kernels that don't use i915_edp_psr_debug,
the ENOENT error will be thrown. This changes the logic
to set PSR via the module parameter if a problem occurs
when attempting to set PSR via the debugfs_fd.

Signed-off-by: Casey Bowman <casey.g.bowman@intel.com>
---
 lib/igt_psr.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/igt_psr.c b/lib/igt_psr.c
index 0ddfb64f..6904393c 100644
--- a/lib/igt_psr.c
+++ b/lib/igt_psr.c
@@ -61,6 +61,8 @@ static int has_psr_debugfs(int debugfs_fd)
 	 * Check if new PSR debugfs api is usable by writing an invalid value.
 	 * Legacy mode will return OK here, debugfs api will return -EINVAL.
 	 * -ENODEV is returned when PSR is unavailable.
+	 * -ENOENT is returned when PSR debugfs api doesn't exist (i.e. using
+	 * an older kernel).
 	 */
 	ret = psr_write(debugfs_fd, "0xf");
 	if (ret == -EINVAL)
@@ -103,11 +105,11 @@ static bool psr_set(int debugfs_fd, bool enable)
 		return false;
 	}
 
-	if (ret == -EINVAL) {
-		ret = psr_modparam_set(enable);
-	} else {
+	if (ret == 0) {
 		ret = psr_write(debugfs_fd, enable ? "0x3" : "0x1");
 		igt_assert(ret > 0);
+	} else {
+		ret = psr_modparam_set(enable);
 	}
 
 	/* Restore original value on exit */
-- 
2.19.0

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-10-18 21:12 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-17 21:26 [igt-dev] [PATCH i-g-t] lib/igt_psr: Changed psr_set logic to account for older kernels Casey Bowman
2018-10-17 21:54 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2018-10-17 22:54 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2018-10-18 21:12 ` [igt-dev] [PATCH i-g-t] " Souza, Jose

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox