flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-09 00:46:17 +00:00
Code Issues Releases Wiki Activity

kms_universal_plane: Don't assert outside of fixtures/subtests

Browse Source 
Doing otherwise breaks listing the subtests. The test was throwing an
error out when universal planes were disabled as well because of that.

Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
This commit is contained in:
Damien Lespiau 2014-07-03 15:50:53 +01:00
parent 3f46e81558
commit 838f321b9f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/kms_universal_plane.c
View File

@ -133,6 +133,7 @@ functional_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
int num_primary = 0, num_cursor = 0; int num_primary = 0, num_cursor = 0;
int i; int i;
igt_assert(data->display.has_universal_planes);
igt_skip_on(pipe >= display->n_pipes); igt_skip_on(pipe >= display->n_pipes);
fprintf(stdout, "Testing connector %s using pipe %c\n", fprintf(stdout, "Testing connector %s using pipe %c\n",
@ -535,8 +536,6 @@ run_tests_for_pipe(data_t *data, enum pipe pipe)
{ {
igt_output_t *output; igt_output_t *output;
igt_assert(data->display.has_universal_planes);
igt_subtest_f("universal-plane-pipe-%c-functional", pipe_name(pipe)) igt_subtest_f("universal-plane-pipe-%c-functional", pipe_name(pipe))
for_each_connected_output(&data->display, output) for_each_connected_output(&data->display, output)
functional_test_pipe(data, pipe, output); functional_test_pipe(data, pipe, output);