From 597cae9b7e36b8d1f95a1102fd4aab9c2e3b18fe Mon Sep 17 00:00:00 2001 From: "Leo (Sunpeng) Li" Date: Fri, 9 Jun 2017 17:08:53 -0400 Subject: tests: Increase value of I915_MAX_PIPES to 6 Increasing max pipe count to 6 to support AMD GPU's. Since some tests' behavior depends on this value, small changes are made to remove this dependency: * kms_ccs: Early abort if wanted_pipe is out-of-bounds. * kms_concurrent: Check if pipe is within bounds first. * kms_pipe_color: Prevent skipping of subsequent tests by placing generated tests in a 'igt_subtest_group'. * kms_plane: Move pipe and plane index checking to subtest group level. v2: Change invalid pipe check on kmstest_pipe_name() to use I915_MAX_PIPE v3: Change tabs to spaces in 'enum pipe' Signed-off-by: Leo (Sunpeng) Li Reviewed-by: Arkadiusz Hiler Tested-by: Tomi Sarvela --- tests/kms_plane.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tests/kms_plane.c') diff --git a/tests/kms_plane.c b/tests/kms_plane.c index e1bd467b..34418cad 100644 --- a/tests/kms_plane.c +++ b/tests/kms_plane.c @@ -354,9 +354,6 @@ test_plane_panning(data_t *data, enum pipe pipe, int plane, igt_output_t *output; int connected_outs = 0; - igt_skip_on(pipe >= data->display.n_pipes); - igt_skip_on(plane >= data->display.pipes[pipe].n_planes); - for_each_valid_output_on_pipe(&data->display, pipe, output) { test_plane_panning_with_output(data, pipe, plane, output, flags); @@ -369,6 +366,11 @@ test_plane_panning(data_t *data, enum pipe pipe, int plane, static void run_tests_for_pipe_plane(data_t *data, enum pipe pipe) { + igt_fixture { + igt_skip_on(pipe >= data->display.n_pipes); + igt_require(data->display.pipes[pipe].n_planes > 0); + } + igt_subtest_f("plane-position-covered-pipe-%s-planes", kmstest_pipe_name(pipe)) { int n_planes = data->display.pipes[pipe].n_planes; -- cgit v1.2.3