[igt-dev] [PATCH i-g-t] i915/pm_backlight: ensure driver is loaded before checking backlight

[Jani Nikula <jani.nikula@intel.com>]

Checking the existence of the backlight interface before ensuring the
driver is loaded skips whenever the test is run without the driver
loaded. None of the tests would work properly if they were run as the
first thing or after tests that unload the driver.

Open the driver (and thus probe it as needed) as the first thing.

(This is the low-hanging fruit. A proper test for skipping would be
based on the presence of embedded displays, not based on the presence of
the interface we're aiming to test.)

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 tests/i915/i915_pm_backlight.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/i915/i915_pm_backlight.c b/tests/i915/i915_pm_backlight.c
index 08c07a5787bb..9753ef957c31 100644
--- a/tests/i915/i915_pm_backlight.c
+++ b/tests/i915/i915_pm_backlight.c
@@ -195,10 +195,6 @@ igt_main
 		drmModeModeInfo *mode;
 		igt_plane_t *primary;
 
-		/* Get the max value and skip the whole test if sysfs interface not available */
-		igt_skip_on(backlight_read(&old, "brightness"));
-		igt_assert(backlight_read(&context.max, "max_brightness") > -1);
-
 		/*
 		 * Backlight tests requires the output to be enabled,
 		 * try to enable all.
@@ -206,6 +202,10 @@ igt_main
 		kmstest_set_vt_graphics_mode();
 		igt_display_require(&display, drm_open_driver(DRIVER_INTEL));
 
+		/* Get the max value and skip the whole test if sysfs interface not available */
+		igt_skip_on(backlight_read(&old, "brightness"));
+		igt_assert(backlight_read(&context.max, "max_brightness") > -1);
+
 		/* should be ../../cardX-$output */
 		igt_assert_lt(12, readlink(BACKLIGHT_PATH "/device", full_name, sizeof(full_name) - 1));
 		name = basename(full_name);
-- 
2.20.1

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