From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Subject: [igt-dev] [PATCH i-g-t 2/2] tests/kms_frontbuffer_tracking: Fix skips when PSR is not available.
Date: Thu, 31 Jan 2019 15:18:52 +0100 [thread overview]
Message-ID: <20190131141852.14187-2-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <20190131141852.14187-1-maarten.lankhorst@linux.intel.com>
Use psr.can_test to determine we can disable PSR, and not skip because
PSR is unavailable.
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
lib/igt_psr.c | 2 +-
tests/kms_frontbuffer_tracking.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/igt_psr.c b/lib/igt_psr.c
index 5eb6d2c6ace5..6ad2c522f9a4 100644
--- a/lib/igt_psr.c
+++ b/lib/igt_psr.c
@@ -106,7 +106,7 @@ static bool psr_set(int debugfs_fd, int mode)
ret = has_psr_debugfs(debugfs_fd);
if (ret == -ENODEV) {
- igt_skip_on_f(mode >= PSR_MODE_1, "PSR not available\n");
+ igt_skip("PSR not available\n");
return false;
}
diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c
index 609f7b41a527..4d15ce1cf1d6 100644
--- a/tests/kms_frontbuffer_tracking.c
+++ b/tests/kms_frontbuffer_tracking.c
@@ -1134,7 +1134,7 @@ static bool disable_features(const struct test_mode *t)
fbc_disable();
drrs_disable();
- return psr_disable(drm.debugfs);
+ return psr.can_test ? psr_disable(drm.debugfs) : false;
}
static void *busy_thread_func(void *data)
--
2.20.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2019-01-31 14:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-31 14:18 [igt-dev] [PATCH i-g-t 1/2] lib/psr: Do not use out of bound enum for psr_set Maarten Lankhorst
2019-01-31 14:18 ` Maarten Lankhorst [this message]
2019-01-31 20:58 ` [igt-dev] [PATCH i-g-t 2/2] tests/kms_frontbuffer_tracking: Fix skips when PSR is not available Souza, Jose
2019-02-01 9:52 ` Maarten Lankhorst
2019-01-31 15:12 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] lib/psr: Do not use out of bound enum for psr_set Patchwork
2019-01-31 21:00 ` [igt-dev] [PATCH i-g-t 1/2] " Souza, Jose
2019-01-31 23:59 ` [igt-dev] ✓ Fi.CI.IGT: success for series starting with [i-g-t,1/2] " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190131141852.14187-2-maarten.lankhorst@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--cc=dhinakaran.pandiyan@intel.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox