Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 54FBA10E491 for ; Wed, 16 Feb 2022 15:22:36 +0000 (UTC) Message-ID: <8a0a0a79-ef07-6eca-9a68-e00106430ab3@intel.com> Date: Wed, 16 Feb 2022 20:52:31 +0530 MIME-Version: 1.0 Content-Language: en-US To: Jeevan B , igt-dev@lists.freedesktop.org References: <20220216072228.18363-1-jeevan.b@intel.com> From: "Sharma, Swati2" In-Reply-To: <20220216072228.18363-1-jeevan.b@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [igt-dev] [PATCH i-g-t v5] tests/kms_extended: Add test for extended mode List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: On 16-Feb-22 12:52 PM, Jeevan B wrote: > Add test for validation of extended mode. > > Signed-off-by: Jeevan B > --- > tests/kms_extended.c | 146 +++++++++++++++++++++++++++++++++++++++++++ > tests/meson.build | 1 + > 2 files changed, 147 insertions(+) > create mode 100644 tests/kms_extended.c > > diff --git a/tests/kms_extended.c b/tests/kms_extended.c > new file mode 100644 > index 00000000..9ba8e27d > --- /dev/null > +++ b/tests/kms_extended.c > @@ -0,0 +1,146 @@ > +/* > + * Copyright © 2022 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. > + * > + * Author: > + * Jeevan B > + */ > + > +#include "igt.h" > + > +IGT_TEST_DESCRIPTION("Test extended mode"); > + > +typedef struct { > + int drm_fd; > + igt_display_t display; Apart from drm_fd and display nothing else is getting used from struct. Remove. > + struct igt_fb fb; > + int n_pipes; > +} data_t; > + > +static void run_extendedmode_basic(data_t *data) > +{ > + struct igt_fb fb, fbs[2]; > + drmModeModeInfo *mode[2]; > + igt_output_t *output, *extended_output[2]; > + igt_display_t *display = &data->display; > + igt_plane_t *plane[2]; > + igt_pipe_crc_t *pipe_crc[2] = { 0 }; > + igt_crc_t ref_crc[2], crc[2]; > + int count = 0, hdisplay, vdisplay; > + cairo_t *cr; > + > + for_each_connected_output(display, output) { > + extended_output[count] = output; > + count++; > + } > + igt_require_f(count > 1, "No valid Second output found\n"); > + There could be separate func() to check this 2 o/p reqt. > + igt_output_set_pipe(extended_output[0], 0); > + igt_output_set_pipe(extended_output[1], 1); > + Here we are assuming pipe 0 and pipe 1. > + mode[0] = igt_output_get_mode(extended_output[0]); > + mode[1] = igt_output_get_mode(extended_output[1]); > + > + igt_create_color_fb(data->drm_fd, mode[0]->hdisplay, mode[0]->vdisplay, > + DRM_FORMAT_XRGB8888, 0, 1, 0, 0, &fbs[0]); Indentation > + igt_create_color_fb(data->drm_fd, mode[1]->hdisplay, mode[1]->vdisplay, > + DRM_FORMAT_XRGB8888, 0, 0, 0, 1, &fbs[1]); Indentation > + > + pipe_crc[0] = igt_pipe_crc_new(data->drm_fd, 0, INTEL_PIPE_CRC_SOURCE_AUTO); > + pipe_crc[1] = igt_pipe_crc_new(data->drm_fd, 1, INTEL_PIPE_CRC_SOURCE_AUTO); > + > + plane[0] = igt_pipe_get_plane_type(&display->pipes[0], DRM_PLANE_TYPE_PRIMARY); > + igt_plane_set_fb(plane[0], &fbs[0]); > + igt_fb_set_size(&fbs[0], plane[0], mode[0]->hdisplay, mode[0]->vdisplay); > + igt_plane_set_size(plane[0], mode[0]->hdisplay, mode[0]->vdisplay); > + > + plane[1] = igt_pipe_get_plane_type(&display->pipes[1], DRM_PLANE_TYPE_PRIMARY); > + igt_plane_set_fb(plane[1], &fbs[1]); > + igt_fb_set_size(&fbs[1], plane[1], mode[1]->hdisplay, mode[1]->vdisplay); > + igt_plane_set_size(plane[1], mode[1]->hdisplay, mode[1]->vdisplay); > + > + igt_display_commit2(display, COMMIT_ATOMIC); > + > + igt_pipe_crc_collect_crc(pipe_crc[0], &ref_crc[0]); > + igt_pipe_crc_collect_crc(pipe_crc[1], &ref_crc[1]); > + > + /*Create a big framebuffer and display it on 2 monitors*/ > + hdisplay = mode[0]->hdisplay + mode[1]->hdisplay; > + vdisplay = max(mode[0]->vdisplay, mode[1]->vdisplay); its width and height of fb. name var that way. > + > + igt_create_fb(data->drm_fd, hdisplay, vdisplay, DRM_FORMAT_XRGB8888, 0, &fb); > + cr = igt_get_cairo_ctx(data->drm_fd, &fb); > + igt_paint_color(cr, 0, 0, hdisplay, vdisplay, 1, 0, 0) > + igt_paint_color(cr, mode[0]->hdisplay, 0, hdisplay, vdisplay, 0, 0, 1); > + igt_put_cairo_ctx(cr); > + > + igt_plane_set_fb(plane[0], &fb); > + igt_fb_set_position(&fb, plane[0], 0, 0); > + igt_fb_set_size(&fb, plane[0], mode[0]->hdisplay, mode[0]->vdisplay); > + > + igt_plane_set_fb(plane[1], &fb); > + igt_fb_set_position(&fb, plane[1], mode[0]->hdisplay, 0); > + igt_fb_set_size(&fb, plane[1], mode[1]->hdisplay, mode[1]->vdisplay); > + > + igt_display_commit2(display, COMMIT_ATOMIC); > + > + igt_pipe_crc_collect_crc(pipe_crc[0], &crc[0]); > + igt_pipe_crc_collect_crc(pipe_crc[1], &crc[1]); > + > + /*Clean up*/ > + igt_remove_fb(data->drm_fd, &fbs[0]); > + igt_remove_fb(data->drm_fd, &fbs[1]); > + igt_remove_fb(data->drm_fd, &fb); > + > + igt_pipe_crc_free(pipe_crc[0]); > + igt_pipe_crc_free(pipe_crc[1]); > + > + igt_output_set_pipe(extended_output[0], PIPE_NONE); > + igt_output_set_pipe(extended_output[1], PIPE_NONE); > + > + igt_plane_set_fb(igt_pipe_get_plane_type(&display->pipes[0], DRM_PLANE_TYPE_PRIMARY), NULL); > + igt_plane_set_fb(igt_pipe_get_plane_type(&display->pipes[1], DRM_PLANE_TYPE_PRIMARY), NULL); > + igt_display_commit2(display, COMMIT_ATOMIC); > + > + /*Compare CRC*/ > + igt_assert_crc_equal(&crc[0], &ref_crc[0]); > + igt_assert_crc_equal(&crc[1], &ref_crc[1]); > +} > + > +igt_main > +{ > + data_t data; > + > + igt_fixture { > + data.drm_fd = drm_open_driver_master(DRIVER_ANY); > + kmstest_set_vt_graphics_mode(); > + igt_display_require(&data.display, data.drm_fd); > + igt_display_require_output(&data.display); > + } > + > + igt_subtest("extended_mode_basic") { > + run_extendedmode_basic(&data); > + } Add igt_describe() Make subtest as dynamic. Our aim is to make all kms IGTs as dynamic. If possible add subtest for clone mode too. > + > + igt_fixture { > + igt_display_fini(&data.display); > + } > +} > diff --git a/tests/meson.build b/tests/meson.build > index 7003d064..15825a4a 100644 > --- a/tests/meson.build > +++ b/tests/meson.build > @@ -28,6 +28,7 @@ test_progs = [ > 'kms_dither', > 'kms_dp_aux_dev', > 'kms_dp_tiled_display', > + 'kms_extended', Rename to kms_display_modes to include both extended and clone subtests > 'kms_flip', > 'kms_flip_event_leak', > 'kms_force_connector_basic', -- ~Swati Sharma