diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/kms_atomic_interruptible.c | 8 | ||||
-rw-r--r-- | tests/kms_atomic_transition.c | 2 | ||||
-rw-r--r-- | tests/kms_crtc_background_color.c | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/tests/kms_atomic_interruptible.c b/tests/kms_atomic_interruptible.c index 4a2a5774..64a00559 100644 --- a/tests/kms_atomic_interruptible.c +++ b/tests/kms_atomic_interruptible.c @@ -158,8 +158,8 @@ static void run_plane_test(igt_display_t *display, enum pipe pipe, igt_output_t uint32_t count_props[3] = { 2, 1, 6 }; uint32_t props[] = { /* crtc: 2 props */ - plane->pipe->atomic_props_crtc[IGT_CRTC_MODE_ID], - plane->pipe->atomic_props_crtc[IGT_CRTC_ACTIVE], + plane->pipe->props[IGT_CRTC_MODE_ID], + plane->pipe->props[IGT_CRTC_ACTIVE], /* connector: 1 prop */ output->props[IGT_CONNECTOR_CRTC_ID], /* plane: remainder props */ @@ -255,6 +255,10 @@ static void run_plane_test(igt_display_t *display, enum pipe pipe, igt_output_t igt_waitchildren(); + /* The mode is unset by the forked helper, force a refresh here */ + if (test_type == test_legacy_modeset || test_type == test_atomic_modeset) + igt_pipe_refresh(display, pipe, true); + igt_plane_set_fb(plane, NULL); igt_plane_set_fb(primary, NULL); igt_output_set_pipe(output, PIPE_NONE); diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c index 2ae75f2d..7ddb65ce 100644 --- a/tests/kms_atomic_transition.c +++ b/tests/kms_atomic_transition.c @@ -633,7 +633,7 @@ static unsigned set_combinations(igt_display_t *display, unsigned mask, struct i drmModeModeInfo *mode = NULL; if (!(mask & (1 << pipe))) { - if (display->pipes[pipe].mode_blob) { + if (igt_pipe_is_prop_changed(display, pipe, IGT_CRTC_ACTIVE)) { event_mask |= 1 << pipe; igt_plane_set_fb(plane, NULL); } diff --git a/tests/kms_crtc_background_color.c b/tests/kms_crtc_background_color.c index e12e1634..659a30b9 100644 --- a/tests/kms_crtc_background_color.c +++ b/tests/kms_crtc_background_color.c @@ -137,7 +137,7 @@ static void test_crtc_background(data_t *data) igt_output_set_pipe(output, pipe); plane = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); - igt_require(plane->pipe->background_property); + igt_require(plane->pipe->props[IGT_CRTC_BACKGROUND]); prepare_crtc(data, output, pipe, plane, 1, PURPLE, BLACK64); |