[igt-dev] [PATCH] tests/kms_cursor_legacy: igt_require_pipe_crc for flip_vs_cursor_crc

[Mark Yacoub]

On Wed, Nov 3, 2021 at 5:55 AM Petri Latvala <petri.latvala at intel.com> wrote:
>
> On Mon, Nov 01, 2021 at 12:37:30PM -0400, Mark Yacoub wrote:
> > From: Mark Yacoub <markyacoub at google.com>
> >
> > [Why]
> > test_init uses CRC in debugfs which is not supported by some drivers.
> >
> > [How]
> > igt_require_pipe_crc before igt_pipe_crc_new is called.
> >
> > Test: igt at kms_cursor_legacy@flip-vs-cursor-crc-{atomic,legacy} on
> > ChromeOS Jacuzzi (MTK)
> >
> > Signed-off-by: Mark Yacoub <markyacoub at chromium.org>
> > ---
> >  tests/kms_cursor_legacy.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/tests/kms_cursor_legacy.c b/tests/kms_cursor_legacy.c
> > index 81362807..b006e566 100644
> > --- a/tests/kms_cursor_legacy.c
> > +++ b/tests/kms_cursor_legacy.c
> > @@ -1281,6 +1281,7 @@ static void flip_vs_cursor_crc(igt_display_t *display, bool atomic)
> >
> >       igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
> >
> > +     igt_require_pipe_crc(display->drm_fd);
> >       pipe_crc = igt_pipe_crc_new(display->drm_fd, pipe, INTEL_PIPE_CRC_SOURCE_AUTO);
>
> These requirement checks should be done before doing anything to the
> system state, even from the context lines of this diff I see a commit
> being done. So this require call should be at the very beginning of
> this function, or in the igt_subtest() block, or in an igt_fixture
> preferrably.
>
> What about flip_vs_cursor_busy_crc?
>
> flip_vs_cursor_crc and flip_vs_cursor_busy_crc are both called in neat
> subtest groups already so I suppose the most elegant solution for both
> is to add
>
> igt_fixture {
>   igt_require_pipe_crc(display.drm_fd);
> }
Thanks for the tip. Done!
>
> to the beginning of both those groups.
>
>
> --
> Petri Latvala