Re: [igt-dev] [PATCH i-g-t 1/2] lib/psr: Do not use out of bound enum for psr_set.

Souza, Jose
2019-01-31T21:00:43Z

[-- Attachment #1.1: Type: text/plain, Size: 1815 bytes --]

On Thu, 2019-01-31 at 15:18 +0100, Maarten Lankhorst wrote:
> Using an undefined int not in the enum is undefined. Use -1 and
> change
> mode to an integer.

Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

>
> 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 | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/lib/igt_psr.c b/lib/igt_psr.c
> index d726fad58e9d..5eb6d2c6ace5 100644
> --- a/lib/igt_psr.c
> +++ b/lib/igt_psr.c
> @@ -100,13 +100,13 @@ static void restore_psr_debugfs(int sig)
> psr_write(psr_restore_debugfs_fd, "0");
> }
>
> -static bool psr_set(int debugfs_fd, enum psr_mode mode)
> +static bool psr_set(int debugfs_fd, int mode)
> {
> int ret;
>
> ret = has_psr_debugfs(debugfs_fd);
> if (ret == -ENODEV) {
> - igt_skip("PSR not available\n");
> + igt_skip_on_f(mode >= PSR_MODE_1, "PSR not
> available\n");
> return false;
> }
>
> @@ -117,7 +117,7 @@ static bool psr_set(int debugfs_fd, enum psr_mode
> mode)
> * version enabled and the PSR version of the test, it
> will
> * fail in the first psr_wait_entry() of the test.
> */
> - ret = psr_modparam_set(mode <= PSR_MODE_2);
> + ret = psr_modparam_set(mode >= PSR_MODE_1);
> } else {
> const char *debug_val;
>
> @@ -155,7 +155,7 @@ bool psr_enable(int debugfs_fd, enum psr_mode
> mode)
> bool psr_disable(int debugfs_fd)
> {
> /* Any mode different than PSR_MODE_1/2 will disable PSR */
> - return psr_set(debugfs_fd, PSR_MODE_2 + 1);
> + return psr_set(debugfs_fd, -1);
> }
>
> bool psr_sink_support(int debugfs_fd, enum psr_mode mode)

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 154 bytes --]