From 9aecda27ffda312e4ecb3b85342da335e38f6538 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Thu, 4 Oct 2018 14:39:06 +0200 Subject: chamelium: Change our pattern for a custom one if needed The current pattern being used is the one generated through the igt_create_color_pattern_fb. However, in order to deal with multiple formats and the upsampling / downsampling issues that might arise from converting back and forth between formats, we will need to have a pattern with quite precise color values, and without any shades or gradient of colors. Let's create a function that will generate that pattern in the chamelium code if we need to convert the framebuffer to a smaller depth, and use the current pattern otherwise. The easiest way to do that will be to only use values that would have the same part on the common most significant bits (5, to deal with most formats) and have the same bit repeated on the least significant bits that are going to be dropped and / or padded when converting between formats. Pixman will fill the lowest bits with 1, and our hardware (this has been tested on a Raspberry Pi's VC4) is able to support that, so the easiest is to just use all 1's for our components in order to still be able to compute the CRCs. Signed-off-by: Maxime Ripard Reviewed-by: Arkadiusz Hiler --- tests/kms_chamelium.c | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/tests/kms_chamelium.c b/tests/kms_chamelium.c index 14b84d469..d6d0f315d 100644 --- a/tests/kms_chamelium.c +++ b/tests/kms_chamelium.c @@ -486,6 +486,42 @@ enable_output(data_t *data, drmModeFreeConnector(connector); } +static void chamelium_paint_xr24_pattern(uint32_t *data, + size_t width, size_t height) +{ + uint32_t colors[] = { 0xff000000, + 0xffff0000, + 0xff00ff00, + 0xff0000ff, + 0xffffffff }; + unsigned i, j; + + for (i = 0; i < height; i++) + for (j = 0; j < width; j++) + *(data + i * width + j) = colors[((j / 64) + (i / 64)) % 5]; +} + +static int chamelium_get_pattern_fb(data_t *data, drmModeModeInfo *mode, + uint32_t fourcc, struct igt_fb *fb) +{ + int fb_id; + void *ptr; + + igt_assert(fourcc == DRM_FORMAT_XRGB8888); + + fb_id = igt_create_fb(data->drm_fd, mode->hdisplay, mode->vdisplay, + fourcc, LOCAL_DRM_FORMAT_MOD_NONE, fb); + igt_assert(fb_id > 0); + + ptr = igt_fb_map_buffer(fb->fd, fb); + igt_assert(ptr); + + chamelium_paint_xr24_pattern(ptr, mode->vdisplay, mode->hdisplay); + igt_fb_unmap_buffer(fb, ptr); + + return fb_id; +} + static void do_test_display_crc(data_t *data, struct chamelium_port *port, igt_output_t *output, drmModeModeInfo *mode, int count) @@ -496,12 +532,8 @@ static void do_test_display_crc(data_t *data, struct chamelium_port *port, struct igt_fb fb; int i, fb_id, captured_frame_count; - fb_id = igt_create_color_pattern_fb(data->drm_fd, - mode->hdisplay, - mode->vdisplay, - DRM_FORMAT_XRGB8888, - LOCAL_DRM_FORMAT_MOD_NONE, - 0, 0, 0, &fb); + fb_id = chamelium_get_pattern_fb(data, mode, + DRM_FORMAT_XRGB8888, &fb); igt_assert(fb_id > 0); fb_crc = chamelium_calculate_fb_crc_async_start(data->drm_fd, -- cgit v1.2.3