Op 08-11-16 om 12:54 schreef Mika Kahola:
> This is a testcase with multiple planes. The idea here is the following
>
> - draw a uniform frame with blue color
> - grab crc for reference
> - put planes randomly on top with the same blue color
> - punch holes with black color into the primary framebuffer
> - ideally the planes should cover these holes so that the output is the
> identical to reference crc
> - composite all with one ioctl call
> - grab crc and verify that the reference crc is equal
> - repeat this for several iterations to maximize coverage
>
> v6: Rename test_planes() to prepare_planes() (Maarten)
> When grabbing reference crc, keep framebuffer and crc enabled for
> atomic mode setting. (Maarten)
> Fix crc collection for legacy modesetting (Maarten)
>
> v5: Remove limit for max number of iterations and add possibility to
> loop forever (Daniel)
> Remove IN_RANGE() macro (Maarten)
> Remove log file and show random number seed on screen instead (Maarten)
> Split legacy and atomic plane tests on own functions (Maarten)
> remove test_atomic() function and pass test mode info as
> parameter (Maarten)
> Use bigger rectangle size (256x256) for non-cursor planes and
> smaller (128x128) size for cursor plane (Maarten)
>
> v4: For atomic test enable crc capturing before entering into a
> iteration loop. After each iteration, check that page flip
> didn't take no more than 1 vblank, fetch all crc's and check
> the values.
>
> Introduce new command line parameter for the number of iterations.
> The test run from 1 to 256 iterations.
>
> v3: Cleanup by removing separate plane array
> For atomic, pass DRM_MODE_PAGE_FLIP_EVENT
> Grab crc by using igt_pipe_crc_get_crc instead of igt_pipe_crc_collect_crc
> Rename nplanes variable to max_planes
> To optimize test execution, run iterations after the modeset
>
> v2: Keep a logfile on random number seeds per subtest that are not skipped
> due to unmet test requirements
>
> Signed-off-by: Mika Kahola <mika.kah...@intel.com>
> ---
> tests/Makefile.sources | 1 +
> tests/kms_plane_multiple.c | 501
> +++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 502 insertions(+)
> create mode 100644 tests/kms_plane_multiple.c
>
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index 6d081c3..ffd59c1 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -105,6 +105,7 @@ TESTS_progs_M = \
> kms_pipe_color \
> kms_pipe_crc_basic \
> kms_plane \
> + kms_plane_multiple \
> kms_properties \
> kms_psr_sink_crc \
> kms_render \
> diff --git a/tests/kms_plane_multiple.c b/tests/kms_plane_multiple.c
> new file mode 100644
> index 0000000..f316488
> --- /dev/null
> +++ b/tests/kms_plane_multiple.c
> @@ -0,0 +1,501 @@
> +/*
> + * Copyright © 2016 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> DEALINGS
> + * IN THE SOFTWARE.
> + *
> + */
> +
> +#include "igt.h"
> +#include "drmtest.h"
> +#include <errno.h>
> +#include <stdbool.h>
> +#include <stdio.h>
> +#include <string.h>
> +#include <time.h>
> +
> +IGT_TEST_DESCRIPTION("Test atomic mode setting with multiple planes ");
> +
> +#define MAX_CRCS 1
> +#define SIZE_PLANE 256
> +#define SIZE_CURSOR 128
> +#define LOOP_FOREVER -1
> +
> +typedef struct {
> + float red;
> + float green;
> + float blue;
> +} color_t;
> +
> +typedef struct {
> + int drm_fd;
> + igt_display_t display;
> + igt_pipe_crc_t *pipe_crc;
> + igt_plane_t *plane[IGT_MAX_PLANES];
> + struct igt_fb fb[IGT_MAX_PLANES];
> +} data_t;
> +
> +typedef struct {
> + data_t *data;
> + igt_crc_t reference_crc;
> +} test_position_t;
> +
> +/* Command line parameters. */
> +struct {
> + int iterations;
> + bool user_seed;
> + int seed;
> +} opt = {
> + .iterations = 64,
> + .user_seed = false,
> + .seed = 1,
> +};
> +
> +static inline uint32_t pipe_select(int pipe)
> +{
> + if (pipe > 1)
> + return pipe << DRM_VBLANK_HIGH_CRTC_SHIFT;
> + else if (pipe > 0)
> + return DRM_VBLANK_SECONDARY;
> + else
> + return 0;
> +}
> +
> +static unsigned int get_vblank(int fd, int pipe, unsigned int flags)
> +{
> + union drm_wait_vblank vbl;
> +
> + memset(&vbl, 0, sizeof(vbl));
> + vbl.request.type = DRM_VBLANK_RELATIVE | pipe_select(pipe) | flags;
> + if (drmIoctl(fd, DRM_IOCTL_WAIT_VBLANK, &vbl))
> + return 0;
> +
> + return vbl.reply.sequence;
> +}
> +
> +/*
> + * Common code across all tests, acting on data_t
> + */
> +static void test_init(data_t *data, enum pipe pipe)
> +{
> + data->pipe_crc = igt_pipe_crc_new(pipe, INTEL_PIPE_CRC_SOURCE_AUTO);
> +}
> +
> +static void test_fini(data_t *data, igt_output_t *output, int max_planes)
> +{
> + for (int i = IGT_PLANE_PRIMARY; i <= max_planes; i++)
> + igt_plane_set_fb(data->plane[i], NULL);
> +
> + /* reset the constraint on the pipe */
> + igt_output_set_pipe(output, PIPE_ANY);
> +
> + igt_pipe_crc_free(data->pipe_crc);
> +}
> +
> +static void
> +test_grab_crc(data_t *data, igt_output_t *output, enum pipe pipe, bool
> atomic,
> + color_t *color, uint64_t tiling, igt_crc_t *crc /* out */)
> +{
> + drmModeModeInfo *mode;
> + int ret, n;
> +
> + igt_output_set_pipe(output, pipe);
> +
> + data->plane[IGT_PLANE_PRIMARY] = igt_output_get_plane(output,
> IGT_PLANE_PRIMARY);
> +
> + mode = igt_output_get_mode(output);
> +
> + igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
> + DRM_FORMAT_XRGB8888,
> + LOCAL_DRM_FORMAT_MOD_NONE,
> + color->red, color->green, color->blue,
> + &data->fb[IGT_PLANE_PRIMARY]);
> +
> + igt_plane_set_fb(data->plane[IGT_PLANE_PRIMARY],
> &data->fb[IGT_PLANE_PRIMARY]);
> +
> + ret = igt_display_try_commit2(&data->display,
> + atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
> + igt_skip_on(ret != 0);
> +
> + igt_pipe_crc_start(data->pipe_crc);
> + n = igt_pipe_crc_get_crcs(data->pipe_crc, 1, &crc);
> + igt_assert_eq(n, 1);
> +
> + if (!atomic) {
> + igt_pipe_crc_stop(data->pipe_crc);
> +
> + igt_plane_set_fb(data->plane[IGT_PLANE_PRIMARY], NULL);
> +
> + ret = igt_display_try_commit2(&data->display, COMMIT_LEGACY);
> + igt_skip_on(ret != 0);
> +
> + igt_remove_fb(data->drm_fd, &data->fb[IGT_PLANE_PRIMARY]);
> + }
^This could use some explanation, why do this only for legacy?
Best not make the atomic and legacy test differ too much here.
~Maarten
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
