Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6FDC310EB14 for ; Fri, 21 Jan 2022 13:34:54 +0000 (UTC) From: Swati Sharma Date: Fri, 21 Jan 2022 19:18:30 +0530 Message-Id: <20220121134833.28740-4-swati2.sharma@intel.com> In-Reply-To: <20220121134833.28740-1-swati2.sharma@intel.com> References: <20220121134833.28740-1-swati2.sharma@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [v2 3/6] tests/kms_plane_scaling: Upscaling on 2 planes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org List-ID: i915 driver supports 2 scalers per pipe. Added test case to upscale 2 overlay planes simultaneously on single pipe. v2: -add check for min 2 scalers -add igt_require() for overlay planes, fixes CRASH on KBL Signed-off-by: Swati Sharma --- tests/kms_plane_scaling.c | 49 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c index 1cf62841..158a6eee 100644 --- a/tests/kms_plane_scaling.c +++ b/tests/kms_plane_scaling.c @@ -242,6 +242,48 @@ static bool test_pipe_iteration(data_t *data, enum pipe pipe, int iteration) return true; } +static void +test_upscale_upscale_plane_scaling_on_pipe(data_t *d, enum pipe pipe, igt_output_t *output) +{ + drmModeModeInfo *mode; + igt_display_t *display = &d->display; + igt_pipe_t *pipe_obj = &display->pipes[pipe]; + + igt_require(get_num_scalers(d, pipe) >= 2); + + mode = igt_output_get_mode(output); + + /* setup display with primary plane */ + d->plane1 = igt_pipe_get_plane_type(pipe_obj, DRM_PLANE_TYPE_PRIMARY); + prepare_crtc(d, output, pipe, d->plane1, mode); + + d->plane2 = igt_pipe_get_plane_type_index(pipe_obj, DRM_PLANE_TYPE_OVERLAY, 0); + igt_require(d->plane2); + d->plane3 = igt_pipe_get_plane_type_index(pipe_obj, DRM_PLANE_TYPE_OVERLAY, 1); + igt_require(d->plane3); + + igt_create_color_pattern_fb(display->drm_fd, + mode->hdisplay / 3, mode->vdisplay / 3, + DRM_FORMAT_XRGB8888, + I915_TILING_NONE, + 1.0, 0.0, 0.0, &d->fb[1]); + igt_create_color_pattern_fb(display->drm_fd, + mode->hdisplay / 3, mode->vdisplay / 3, + DRM_FORMAT_XRGB8888, + I915_TILING_NONE, + 0.0, 1.0, 0.0, &d->fb[2]); + + igt_plane_set_fb(d->plane2, &d->fb[1]); + igt_plane_set_fb(d->plane3, &d->fb[2]); + + /* 1st overlay plane upscaling */ + igt_plane_set_size(d->plane2, mode->hdisplay, mode->vdisplay); + /* 2nd overlay plane upscaling */ + igt_plane_set_size(d->plane3, mode->hdisplay - 20, mode->vdisplay - 20); + + igt_display_commit2(display, COMMIT_ATOMIC); +} + static void test_scaler_with_rotation_pipe(data_t *d, enum pipe pipe, igt_output_t *output) { @@ -547,6 +589,13 @@ igt_main_args("", long_opts, help_str, opt_handler, &data) igt_subtest_group { igt_output_t *output; + igt_describe("Tests upscaling of 2 overlay planes."); + igt_subtest_with_dynamic("upscale-upscale-plane-scaling") { + for_each_pipe_with_valid_output(&data.display, pipe, output) + igt_dynamic_f("pipe-%s-%s-upscale-upscale-plane-scaling", kmstest_pipe_name(pipe), igt_output_name(output)) + test_upscale_upscale_plane_scaling_on_pipe(&data, pipe, output); + } + igt_describe("Tests scaling with pixel formats."); igt_subtest_with_dynamic("scaler-with-pixel-format") { for_each_pipe_with_single_output(&data.display, pipe, output) -- 2.25.1