From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.bootlin.com (mail.bootlin.com [62.4.15.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 7C3356F396 for ; Fri, 14 Dec 2018 09:23:44 +0000 (UTC) Date: Fri, 14 Dec 2018 10:22:52 +0100 From: Maxime Ripard Message-ID: <20181214092252.ohezjsfvsyfdbtvt@flea> References: <20181213155533.18048-1-paul.kocialkowski@bootlin.com> <20181213155533.18048-13-paul.kocialkowski@bootlin.com> MIME-Version: 1.0 In-Reply-To: <20181213155533.18048-13-paul.kocialkowski@bootlin.com> Subject: Re: [igt-dev] [PATCH i-g-t v2 12/12] chamelium: Add a CRC-based display test for randomized planes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============1983802323==" Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: Paul Kocialkowski Cc: Petri Latvala , Eben Upton , igt-dev@lists.freedesktop.org, Boris Brezillon , Thomas Petazzoni List-ID: --===============1983802323== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="svvnt7wonspkgvoc" Content-Disposition: inline --svvnt7wonspkgvoc Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, On Thu, Dec 13, 2018 at 04:55:33PM +0100, Paul Kocialkowski wrote: > This introduces a new test for the Chamelium, that sets up planes > with randomized properties such as the format, dimensions, position, > in-framebuffer offsets and stride. The Chamelium capture is checked > against the reference generated by cairo with a CRC. >=20 > This test also includes testing of the VC4-specific T-tiled mode > (in XR24 format). >=20 > Since this test does not share much with previous CRC-based display > tests (especially regarding KMS configuration), most of the code is > not shared with other tests. >=20 > This test can be derived with reproducible properties for regression > testing in the future. For now, it serves as a fuzzing test >=20 > Signed-off-by: Paul Kocialkowski I'm really wondering if we shouldn't just move the common functions (like enable_output) to lib, and create a new file for this test. This test is quite unusual since it's an exploratory test, where you want to test values that will break, while the rest of the tests in that file are regression tests. > --- > tests/kms_chamelium.c | 296 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 296 insertions(+) >=20 > diff --git a/tests/kms_chamelium.c b/tests/kms_chamelium.c > index 7d95a8bc52f3..efd70f0f1b59 100644 > --- a/tests/kms_chamelium.c > +++ b/tests/kms_chamelium.c > @@ -26,6 +26,8 @@ > =20 > #include "config.h" > #include "igt.h" > +#include "igt_sysfs.h" > +#include "igt_vc4.h" > =20 > #include > #include > @@ -703,6 +705,295 @@ test_display_frame_dump(data_t *data, struct chamel= ium_port *port) > drmModeFreeConnector(connector); > } > =20 > +static uint32_t random_plane_formats[] =3D { > + DRM_FORMAT_ABGR8888, > + DRM_FORMAT_ARGB1555, > + DRM_FORMAT_ARGB8888, > + DRM_FORMAT_RGB565, > + DRM_FORMAT_BGR565, > + DRM_FORMAT_RGB888, > + DRM_FORMAT_BGR888, > + DRM_FORMAT_XBGR8888, > + DRM_FORMAT_XRGB1555, > + DRM_FORMAT_XRGB8888, > +}; I guess we should make this generic to whatever is supported by igt_convert and the hardware? > +static void randomize_plane_dimensions(drmModeModeInfo *mode, > + uint32_t *width, uint32_t *height, > + uint32_t *src_x, uint32_t *src_y, > + uint32_t *crtc_w, uint32_t *crtc_h, > + int32_t *crtc_x, int32_t *crtc_y) > +{ > + /* Randomize width and height in the mode dimensions range. */ > + *width =3D (rand() % mode->hdisplay) + 1; > + *height =3D (rand() % mode->vdisplay) + 1; > + > + /* > + * Randomize source offset, but keep at least half of the > + * original size. > + */ > + *src_x =3D rand() % (*width / 2); > + *src_y =3D rand() % (*height / 2); > + > + /* > + * The on-crtc size does not include the source offset, so it > + * needs to be subtracted to avoid scaling. > + */ > + *crtc_w =3D *width - *src_x; > + *crtc_h =3D *height - *src_y; > + > + /* > + * Randomize the on-crtc position and allow the plane to go > + * off-display by up to half of its width and height. > + */ > + *crtc_x =3D (rand() % mode->hdisplay) - *width / 2; > + *crtc_y =3D (rand() % mode->vdisplay) - *height / 2; > +} > + > +static void blit_plane_cairo(data_t *data, cairo_surface_t *result, > + uint32_t src_x, uint32_t src_y, > + uint32_t crtc_w, uint32_t crtc_h, > + int32_t crtc_x, int32_t crtc_y, > + struct igt_fb *fb) > +{ > + cairo_surface_t *surface; > + int32_t x, y; > + cairo_t *cr; > + > + surface =3D igt_get_cairo_surface(data->drm_fd, fb); > + > + x =3D crtc_x - (int32_t) src_x; > + y =3D crtc_y - (int32_t) src_y; > + > + cr =3D cairo_create(result); > + > + cairo_set_source_surface(cr, surface, x, y); > + cairo_surface_destroy(surface); > + > + /* Clip the surface to a rectangle if needed. */ > + if (src_x || src_y) { > + cairo_rectangle(cr, crtc_x, crtc_y, crtc_w, crtc_h); > + cairo_clip(cr); > + } > + > + cairo_paint(cr); > + > + cairo_destroy(cr); > +} > + > +static void configure_plane(igt_plane_t *plane, uint32_t src_x, uint32_t= src_y, > + uint32_t crtc_w, uint32_t crtc_h, int32_t crtc_x, > + int32_t crtc_y, struct igt_fb *fb) > +{ > + igt_plane_set_fb(plane, fb); > + > + igt_plane_set_position(plane, crtc_x, crtc_y); > + igt_plane_set_size(plane, crtc_w, crtc_h); > + > + igt_fb_set_position(fb, plane, src_x, src_y); > + /* Framebuffer source size set to on-CRTC size to avoid scaling. */ > + igt_fb_set_size(fb, plane, crtc_w, crtc_h); > +} > + > +static void test_display_planes_random(data_t *data, > + struct chamelium_port *port, > + enum chamelium_check check) > +{ > + igt_output_t *output; > + drmModeModeInfo *mode; > + igt_plane_t *primary_plane; > + struct igt_fb primary_fb; > + struct igt_fb result_fb; > + struct igt_fb *overlay_fbs; > + igt_crc_t *crc; > + igt_crc_t *expected_crc; > + struct chamelium_fb_crc_async_data *fb_crc; > + unsigned int overlay_planes_max =3D 0; > + unsigned int overlay_planes_count; > + cairo_surface_t *result_surface; > + int captured_frame_count; > + unsigned int i; > + int fb_id; > + > + igt_assert(check =3D=3D CHAMELIUM_CHECK_CRC); > + > + srand(time(NULL)); > + > + reset_state(data, port); > + > + /* Find the connector and pipe. */ > + output =3D prepare_output(data, port); > + > + mode =3D igt_output_get_mode(output); > + > + /* Get a framebuffer for the primary plane. */ > + primary_plane =3D igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIM= ARY); > + igt_assert(primary_plane); > + > + fb_id =3D chamelium_get_pattern_fb(data, mode->hdisplay, mode->vdisplay, > + DRM_FORMAT_XRGB8888, 64, &primary_fb); > + igt_assert(fb_id > 0); > + > + /* Get a framebuffer for the cairo composition result. */ > + fb_id =3D igt_create_fb(data->drm_fd, mode->hdisplay, > + mode->vdisplay, DRM_FORMAT_XRGB8888, > + LOCAL_DRM_FORMAT_MOD_NONE, &result_fb); > + igt_assert(fb_id > 0); > + > + result_surface =3D igt_get_cairo_surface(data->drm_fd, &result_fb); > + > + /* Paint the primary framebuffer on the result surface. */ > + blit_plane_cairo(data, result_surface, 0, 0, 0, 0, 0, 0, &primary_fb); > + > + /* Configure the primary plane. */ > + igt_plane_set_fb(primary_plane, &primary_fb); > + > + overlay_planes_max =3D > + igt_output_count_plane_type(output, DRM_PLANE_TYPE_OVERLAY); > + > + /* Limit the number of planes to a reasonable scene. */ > + if (overlay_planes_max > 4) > + overlay_planes_max =3D 4; > + > + overlay_planes_count =3D (rand() % overlay_planes_max) + 1; > + igt_debug("Using %d overlay planes\n", overlay_planes_count); > + > + overlay_fbs =3D calloc(sizeof(struct igt_fb), overlay_planes_count); > + > + for (i =3D 0; i < overlay_planes_count; i++) { > + struct igt_fb *overlay_fb =3D &overlay_fbs[i]; > + igt_plane_t *plane; > + struct igt_fb pattern_fb; > + uint32_t overlay_fb_w, overlay_fb_h; > + int32_t overlay_crtc_x, overlay_crtc_y; > + uint32_t overlay_crtc_w, overlay_crtc_h; > + uint32_t overlay_src_x, overlay_src_y; > + unsigned int index; > + unsigned int stride_min; > + unsigned int stride; > + bool vc4_t_tiled; > + uint32_t format; > + > + plane =3D igt_output_get_plane_type_index(output, > + DRM_PLANE_TYPE_OVERLAY, > + i); > + igt_assert(plane); > + > + randomize_plane_dimensions(mode, &overlay_fb_w, &overlay_fb_h, > + &overlay_src_x, &overlay_src_y, > + &overlay_crtc_w, &overlay_crtc_h, > + &overlay_crtc_x, &overlay_crtc_y); > + > + igt_debug("Plane %d: on-crtc size %dx%d\n", i, overlay_crtc_w, > + overlay_crtc_h); > + igt_debug("Plane %d: on-crtc position %dx%d\n", i, > + overlay_crtc_x, overlay_crtc_y); > + igt_debug("Plane %d: in-framebuffer position %dx%d\n", i, > + overlay_src_x, overlay_src_y); > + > + /* Get a pattern framebuffer for the overlay plane. */ > + fb_id =3D chamelium_get_pattern_fb(data, overlay_fb_w, > + overlay_fb_h, > + DRM_FORMAT_XRGB8888, > + 32, &pattern_fb); > + igt_assert(fb_id > 0); > + > + /* Randomize the use of tiled mode with a 1/4 probability. */ > + index =3D rand() % 4; > + > + if (is_vc4_device(data->drm_fd) && index =3D=3D 0) { > + format =3D DRM_FORMAT_XRGB8888; > + vc4_t_tiled =3D true; > + > + igt_debug("Plane %d: VC4 T-tiled %s format\n", i, > + igt_format_str(format)); > + } else { > + /* Randomize the format to test. */ > + index =3D rand() % ARRAY_SIZE(random_plane_formats); > + format =3D random_plane_formats[index]; > + vc4_t_tiled =3D false; > + > + igt_debug("Plane %d: %s format\n", i, > + igt_format_str(format)); > + } > + > + /* Convert the pattern to the test format if needed. */ > + if (vc4_t_tiled) { > + fb_id =3D igt_vc4_fb_t_tiled_convert(overlay_fb, > + &pattern_fb); > + igt_assert(fb_id > 0); > + } else { > + stride_min =3D overlay_fb_w * > + igt_format_plane_bpp(format, 0) / 8; > + > + /* Randomize the stride with at most twice the minimum. */ > + stride =3D (rand() % stride_min) + stride_min; > + > + /* Pixman requires the stride to be aligned to 32-byte words. */ > + stride =3D ALIGN(stride, sizeof(uint32_t)); > + > + igt_debug("Plane %d: using stride %d\n", i, stride); > + > + fb_id =3D igt_fb_convert_with_stride(overlay_fb, > + &pattern_fb, > + format, stride); > + igt_assert(fb_id); > + } > + > + blit_plane_cairo(data, result_surface, overlay_src_x, > + overlay_src_y, overlay_crtc_w, overlay_crtc_h, > + overlay_crtc_x, overlay_crtc_y, &pattern_fb); > + > + configure_plane(plane, overlay_src_x, overlay_src_y, > + overlay_crtc_w, overlay_crtc_h, overlay_crtc_x, > + overlay_crtc_y, overlay_fb); > + > + /* Remove the original pattern framebuffer. */ > + igt_remove_fb(data->drm_fd, &pattern_fb); > + } > + > + cairo_surface_destroy(result_surface); > + > + fb_crc =3D chamelium_calculate_fb_crc_async_start(data->drm_fd, > + &result_fb); > + > + igt_display_commit2(&data->display, COMMIT_ATOMIC); > + > + chamelium_capture(data->chamelium, port, 0, 0, 0, 0, 1); > + crc =3D chamelium_read_captured_crcs(data->chamelium, > + &captured_frame_count); > + > + igt_assert(captured_frame_count =3D=3D 1); > + > + expected_crc =3D chamelium_calculate_fb_crc_async_finish(fb_crc); > + > + chamelium_assert_crc_eq_or_dump(data->chamelium, > + expected_crc, crc, > + &result_fb, i); > + > + free(expected_crc); > + free(crc); > + > + for (i =3D 0; i < overlay_planes_count; i++) { > + struct igt_fb *overlay_fb =3D &overlay_fbs[i]; > + igt_plane_t *plane; > + > + plane =3D igt_output_get_plane_type_index(output, > + DRM_PLANE_TYPE_OVERLAY, > + i); > + igt_assert(plane); > + > + igt_plane_set_fb(plane, NULL); > + igt_remove_fb(data->drm_fd, overlay_fb); > + } > + > + free(overlay_fbs); > + > + igt_plane_set_fb(primary_plane, NULL); > + igt_remove_fb(data->drm_fd, &primary_fb); > + igt_remove_fb(data->drm_fd, &result_fb); > +} > + This function is still pretty long and could be split into smaller chunks. Maxime --=20 Maxime Ripard, Bootlin Embedded Linux and Kernel engineering https://bootlin.com --svvnt7wonspkgvoc Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCXBN2bAAKCRDj7w1vZxhR xextAP9Ey8taLC/Q+pMObG55Wgf0C6FZHA8N5lWeegqmk8mLbAD8CgQw8Bxo4YvD 5c/tWrWqvK5SxqXRCBVvEnJKQXlL5gY= =doah -----END PGP SIGNATURE----- --svvnt7wonspkgvoc-- --===============1983802323== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KaWd0LWRldiBt YWlsaW5nIGxpc3QKaWd0LWRldkBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pZ3QtZGV2Cg== --===============1983802323==--