diff options
| author | Stanislav Lisovskiy <stanislav.lisovskiy@intel.com> | 2020-06-30 16:24:19 +0300 |
|---|---|---|
| committer | Swati Sharma <swati2.sharma@intel.com> | 2020-07-10 18:34:22 +0530 |
| commit | bc81be6915e4e23a5dc52f50a0c67462e321963f (patch) | |
| tree | 18b2ae7341e62b405fc9a9c9038b937044d04794 /tests | |
| parent | a048d54f58dd70b07dbeb4541b273ec230ddb586 (diff) | |
igt/tests: Clear pipes properly in kms_atomic_transition
There is an issue happening from time to time in kms_atomic_transition
(bug #1918). We periodically get assertion that some two outputs
attempt to use same pipe like this:
"Failed assertion: output->pending_pipe != b->pending_pipe"
After some investigation came to conclusion that this is happening
because we are calling igt_output_set_pipe(output, PIPE_NONE) only
for connected outputs, which is wrong.
Periodically igt_display_refresh/igt_output_refresh call calls can
update the output state to disconnected. However that doesn't clear
the pipe being assigned(i.e output->pending_pipe).
So this causes assertion to be triggered on next igt_display_refresh
called during commit.
Bugzilla: https://gitlab.freedesktop.org/drm/intel/-/issues/1918
v2: - Do not use for_each_valid_output_on_pipe as it also iterates
only on connected outputs(Maarten)
- Also fix run_modeset_tests function
Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/kms_atomic_transition.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c index 754a49690..656bd51ef 100644 --- a/tests/kms_atomic_transition.c +++ b/tests/kms_atomic_transition.c @@ -664,9 +664,10 @@ static unsigned set_combinations(igt_display_t *display, unsigned mask, struct i igt_output_t *output; enum pipe pipe; unsigned event_mask = 0; + int i; - for_each_connected_output(display, output) - igt_output_set_pipe(output, PIPE_NONE); + for (i = 0; i < display->n_outputs; i++) + igt_output_set_pipe(&display->outputs[i], PIPE_NONE); for_each_pipe(display, pipe) { igt_plane_t *plane = igt_pipe_get_plane_type(&display->pipes[pipe], @@ -743,11 +744,12 @@ static void run_modeset_tests(igt_display_t *display, int howmany, bool nonblock igt_output_t *output; unsigned width = 0, height = 0; + for (i = 0; i < display->n_outputs; i++) + igt_output_set_pipe(&display->outputs[i], PIPE_NONE); + for_each_connected_output(display, output) { drmModeModeInfo *mode = igt_output_get_mode(output); - igt_output_set_pipe(output, PIPE_NONE); - width = max(width, mode->hdisplay); height = max(height, mode->vdisplay); } |