Re: [igt-dev] [PATCH i-g-t] tests/kms_big_fb: Allow modeset to surivive change of cdclk

Ville Syrjälä
2020-04-17T13:17:19Z

On Fri, Apr 17, 2020 at 12:24:24PM +0300, Juha-Pekka Heikkila wrote:
> When testing 64bpp formats there will come modeset to change cdclk.
> Allow modesets on atomic commits so commits will not produce error.
>
> Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
> ---
> tests/kms_big_fb.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/tests/kms_big_fb.c b/tests/kms_big_fb.c
> index eb144da9..8ea7b5d1 100644
> --- a/tests/kms_big_fb.c
> +++ b/tests/kms_big_fb.c
> @@ -294,6 +294,7 @@ static bool test_plane(data_t *data)
> */
> if (i == 0 && data->display.is_atomic &&
> igt_display_try_commit_atomic(&data->display,
> + DRM_MODE_ATOMIC_ALLOW_MODESET |
> DRM_MODE_ATOMIC_TEST_ONLY,
> NULL) != 0) {
> if (igt_plane_has_prop(plane, IGT_PLANE_ROTATION))
> @@ -318,8 +319,11 @@ static bool test_plane(data_t *data)
> copy_pattern(data, small_fb, 0, 0, big_fb, x, y,
> small_fb->width, small_fb->height);
>
> - igt_display_commit2(&data->display, data->display.is_atomic ?
> - COMMIT_ATOMIC : COMMIT_UNIVERSAL);
> + if (data->display.is_atomic) {
> + igt_display_commit_atomic(&data->display, DRM_MODE_ATOMIC_ALLOW_MODESET, NULL);

As I said, igt_display_commit2() already passes in
DRM_MODE_ATOMIC_ALLOW_MODESET so this should not be necessary.

> + } else {
> + igt_display_commit2(&data->display, COMMIT_UNIVERSAL);
> + }
>
>
> igt_pipe_crc_collect_crc(data->pipe_crc, &small_crc);
> --
> 2.26.0
>
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev

--
Ville Syrjälä
Intel