From: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
To: "José Roberto de Souza" <jose.souza@intel.com>,
igt-dev@lists.freedesktop.org
Subject: Re: [igt-dev] [PATCH i-g-t 07/10] lib/psr: Drop support to old kernels without new PSR debugfs interface
Date: Tue, 15 Jan 2019 21:21:03 -0800 [thread overview]
Message-ID: <1fefb333444bd5ad208445b4dcfacb85cb2cbc93.camel@intel.com> (raw)
In-Reply-To: <20190112014607.13446-7-jose.souza@intel.com>
On Fri, 2019-01-11 at 17:46 -0800, José Roberto de Souza wrote:
> The nexts patches will add PSR2 tests and for that we need the new
> PSR debugfs interface that was released in kernel 4.20 so it will not
> break for any updated system and we can drop support to the old
> debugsfs and the support to kernels without even a debugfs interface.
Can't we have psr_set(mode == PSR_MODE_2) skip if the kernel does not
support the new interface?
>
> Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
> Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
> ---
> lib/igt_psr.c | 35 +++++++----------------------------
> 1 file changed, 7 insertions(+), 28 deletions(-)
>
> diff --git a/lib/igt_psr.c b/lib/igt_psr.c
> index c6638c2c..5cc0fbc2 100644
> --- a/lib/igt_psr.c
> +++ b/lib/igt_psr.c
> @@ -73,27 +73,7 @@ static int has_psr_debugfs(int debugfs_fd)
> * -ENODEV is returned when PSR is unavailable.
> */
> ret = psr_write(debugfs_fd, "0xf");
> - if (ret == -EINVAL)
> - return 0;
> - else if (ret < 0)
> - return ret;
> -
> - /* legacy debugfs api, we enabled irqs by writing, disable
> them. */
> - psr_write(debugfs_fd, "0");
> - return -EINVAL;
> -}
> -
> -static bool psr_modparam_set(int val)
> -{
> - static int oldval = -1;
> -
> - igt_set_module_param_int("enable_psr", val);
> -
> - if (val == oldval)
> - return false;
> -
> - oldval = val;
> - return true;
> + return ret == -EINVAL ? 0 : ret;
> }
>
> static int psr_restore_debugfs_fd = -1;
> @@ -109,16 +89,15 @@ static bool psr_set(int debugfs_fd, bool enable)
>
> ret = has_psr_debugfs(debugfs_fd);
> if (ret == -ENODEV) {
> - igt_skip_on_f(enable, "PSR not available\n");
> + igt_skip("PSR not available\n");
> + return false;
> + } else if (ret) {
> + igt_skip("PSR debugfs interface not available\n");
> return false;
> }
>
> - if (ret == -EINVAL) {
> - ret = psr_modparam_set(enable);
> - } else {
> - ret = psr_write(debugfs_fd, enable ? "0x3" : "0x1");
> - igt_assert(ret > 0);
> - }
> + ret = psr_write(debugfs_fd, enable ? "0x3" : "0x1");
> + igt_assert(ret > 0);
>
> /* Restore original value on exit */
> if (psr_restore_debugfs_fd == -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-16 5:21 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-12 1:45 [igt-dev] [PATCH i-g-t 01/10] lib/psr: Add a macro with the maximum lenght of i915_edp_psr_status and use it José Roberto de Souza
2019-01-12 1:45 ` [igt-dev] [PATCH i-g-t 02/10] tests/psr: Share the code check if sink supports PSR José Roberto de Souza
2019-01-12 1:46 ` [igt-dev] [PATCH i-g-t 03/10] lib/psr: Add support to new modified i915_edp_psr_status output José Roberto de Souza
2019-01-14 18:26 ` Rodrigo Vivi
2019-01-12 1:46 ` [igt-dev] [PATCH i-g-t 04/10] lib/psr: Only care about DEEP_SLEEP state for PSR2 José Roberto de Souza
2019-01-12 1:46 ` [igt-dev] [PATCH i-g-t 05/10] lib/psr: Rename psr_wait_exit to psr_wait_update José Roberto de Souza
2019-01-16 4:55 ` Dhinakaran Pandiyan
2019-01-12 1:46 ` [igt-dev] [PATCH i-g-t 06/10] lib/psr: Make psr_wait_entry and psr_wait_update aware of the PSR version tested José Roberto de Souza
2019-01-16 5:19 ` Dhinakaran Pandiyan
2019-01-17 1:59 ` Souza, Jose
2019-01-12 1:46 ` [igt-dev] [PATCH i-g-t 07/10] lib/psr: Drop support to old kernels without new PSR debugfs interface José Roberto de Souza
2019-01-16 5:21 ` Dhinakaran Pandiyan [this message]
2019-01-17 2:07 ` Souza, Jose
2019-01-17 2:16 ` Dhinakaran Pandiyan
2019-01-17 21:17 ` Souza, Jose
2019-01-17 9:50 ` Petri Latvala
2019-01-12 1:46 ` [igt-dev] [PATCH i-g-t 08/10] lib/psr: Add PSR2 support to the remaning psr functions José Roberto de Souza
2019-01-16 5:33 ` Dhinakaran Pandiyan
2019-01-17 2:14 ` Souza, Jose
2019-01-17 2:27 ` Dhinakaran Pandiyan
2019-01-12 1:46 ` [igt-dev] [PATCH i-g-t 09/10] test/psr: Add a generic function to setup each test José Roberto de Souza
2019-01-12 1:46 ` [igt-dev] [PATCH i-g-t 10/10] tests/psr: Add the same test coverage that we have for PSR1 to PSR2 José Roberto de Souza
2019-01-14 18:25 ` Rodrigo Vivi
2019-01-16 6:44 ` Dhinakaran Pandiyan
2019-01-17 21:43 ` Souza, Jose
2019-01-17 21:51 ` Dhinakaran Pandiyan
2019-01-17 23:05 ` Souza, Jose
2019-01-17 23:09 ` Pandiyan, Dhinakaran
2019-01-17 23:41 ` Souza, Jose
2019-01-12 2:32 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,01/10] lib/psr: Add a macro with the maximum lenght of i915_edp_psr_status and use it Patchwork
2019-01-12 8:48 ` [igt-dev] ✓ Fi.CI.IGT: " 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=1fefb333444bd5ad208445b4dcfacb85cb2cbc93.camel@intel.com \
--to=dhinakaran.pandiyan@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=jose.souza@intel.com \
/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