Signed-off-by: Jani Nikula <[email protected]>
---
 tests/pm_backlight.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/pm_backlight.c b/tests/pm_backlight.c
index c199b9bf4baf..8258d4e4c124 100644
--- a/tests/pm_backlight.c
+++ b/tests/pm_backlight.c
@@ -95,7 +95,7 @@ static int backlight_write(int value, const char *fname)
        return 0;
 }
 
-static void test_and_verify(int val)
+static void test_and_verify(struct context *context, int val)
 {
        int result;
        int tolerance = val * TOLERANCE / 100;
@@ -107,15 +107,15 @@ static void test_and_verify(int val)
 
        igt_assert_eq(backlight_read(&result, "actual_brightness"), 0);
        /* Some rounding may happen depending on hw. Just check that it's close 
enough. */
-       igt_assert_lte(result, val + tolerance);
-       igt_assert_lte(val - tolerance, result);
+       igt_assert_lte(result, min(context->max, val + tolerance));
+       igt_assert_lte(max(0, val - tolerance), result);
 }
 
 static void test_brightness(struct context *context)
 {
-       test_and_verify(0);
-       test_and_verify(context->max);
-       test_and_verify(context->max / 2);
+       test_and_verify(context, 0);
+       test_and_verify(context, context->max);
+       test_and_verify(context, context->max / 2);
 }
 
 static void test_bad_brightness(struct context *context)
@@ -142,11 +142,11 @@ static void test_fade(struct context *context)
 
        /* Fade out, then in */
        for (i = context->max; i > 0; i -= context->max / FADESTEPS) {
-               test_and_verify(i);
+               test_and_verify(context, i);
                nanosleep(&ts, NULL);
        }
        for (i = 0; i <= context->max; i += context->max / FADESTEPS) {
-               test_and_verify(i);
+               test_and_verify(context, i);
                nanosleep(&ts, NULL);
        }
 }
-- 
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to