From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 33BB1C2BA1A for ; Wed, 19 Jun 2024 07:52:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CB31010EAC2; Wed, 19 Jun 2024 07:52:42 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="d4pNolny"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 09BD710EB0F for ; Wed, 19 Jun 2024 07:52:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718783560; x=1750319560; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=44qjnqmTqrX3GEcYJOxpkLu8yRmnsQdQwtb5RByE39w=; b=d4pNolnyq5udMIs6z0aPAobtYeqUnFWg62QBsiEAqfe4L8yUfAAub9ve ulzzf3F2cMdlA7WUmrIoesKFb8dmutE6PhCrKCeY4yGDccUx/IuqT0AkU +1H/HKrQfmsMSLq54FkTBjQCIVwdAm9GsTCf7bpnloAgUgVoqs0g+8hW9 ykCSE1K/49sXM6OtlF65mpzy+hcR5PTwifTBAg22kG9Kg353PjXWThqD0 vAmWtlqyEqFkc7u6UkxPHPRyMiP1JlFAX4LKGxkvlpOdsQZNZp89XRQEd FOhm3d5LCIo/jirCk+mwSEXt8RvANoWwvuFN/QbLpmY5QIwZwlVEtqBFw w==; X-CSE-ConnectionGUID: SWa1ou0QSwCiNHKUxCkUjw== X-CSE-MsgGUID: ytVpodC+Tyq0LStkjvxMwg== X-IronPort-AV: E=McAfee;i="6700,10204,11107"; a="15850213" X-IronPort-AV: E=Sophos;i="6.08,249,1712646000"; d="scan'208";a="15850213" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jun 2024 00:52:14 -0700 X-CSE-ConnectionGUID: 3qiNsYP0TO6gDOmPebMqDg== X-CSE-MsgGUID: kG9Psb/rR4a201WUk31afw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,249,1712646000"; d="scan'208";a="42308952" Received: from kunal-x299-aorus-gaming-3-pro.iind.intel.com ([10.190.239.13]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jun 2024 00:52:13 -0700 From: Kunal Joshi To: igt-dev@lists.freedesktop.org Cc: Kunal Joshi , Aurabindo Pillai Subject: [PATCH i-g-t 1/2] tests/kms_bw: add subtest for only connected outputs Date: Wed, 19 Jun 2024 13:34:07 +0530 Message-Id: <20240619080408.1161329-2-kunal1.joshi@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240619080408.1161329-1-kunal1.joshi@intel.com> References: <20240619080408.1161329-1-kunal1.joshi@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" forcing DP connector doesn't work well and tests are skipping with unsupported mode, add new test which runs test on connected outputs only. v2: added debug print for better clarity of skips on unsupported mode v3: added new line in info moved skip after test_init updated test_init logic based on physical flag Cc: Aurabindo Pillai Signed-off-by: Kunal Joshi Reviewed-by: Aurabindo Pillai --- tests/kms_bw.c | 48 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/tests/kms_bw.c b/tests/kms_bw.c index 05f7e79ad..2c42acbdc 100644 --- a/tests/kms_bw.c +++ b/tests/kms_bw.c @@ -48,6 +48,19 @@ * @2560x1440p: 2560x1440 resolution * @3840x2160p: 3840x2160 resolution * @2160x1440p: 2160x1440 resolution + * + * SUBTEST: connected-linear-tiling-%d-displays-%s + * Description: bw test with %arg[2] + * + * arg[1].values: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 + * + * arg[2]: + * + * @1920x1080p: 1920x1080 resolution + * @2560x1440p: 2560x1440 resolution + * @3840x2160p: 3840x2160 resolution + * @2160x1440p: 2160x1440 resolution + * */ /* Common test data. */ @@ -55,6 +68,7 @@ typedef struct data { igt_display_t display; igt_plane_t *primary[IGT_MAX_PIPES]; igt_output_t *output[IGT_MAX_PIPES]; + igt_output_t *connected_output[IGT_MAX_PIPES]; igt_pipe_t *pipe[IGT_MAX_PIPES]; igt_pipe_crc_t *pipe_crc[IGT_MAX_PIPES]; drmModeModeInfo mode[IGT_MAX_PIPES]; @@ -62,6 +76,7 @@ typedef struct data { int w[IGT_MAX_PIPES]; int h[IGT_MAX_PIPES]; int fd; + int connected_outputs; } data_t; static drmModeModeInfo test_mode[] = { @@ -103,11 +118,12 @@ static drmModeModeInfo test_mode[] = { }; -static void test_init(data_t *data) +static void test_init(data_t *data, bool physical) { igt_display_t *display = &data->display; int i, max_pipes = display->n_pipes; igt_output_t *output; + data->connected_outputs = 0; for_each_pipe(display, i) { data->pipe_id[i] = i; @@ -120,16 +136,16 @@ static void test_init(data_t *data) } for (i = 0; i < display->n_outputs && i < max_pipes; i++) { - if (!data->pipe[i]) + if (!data->pipe[i] && !physical) continue; output = &display->outputs[i]; - data->output[i] = output; /* Only allow physically connected displays for the tests. */ if (!igt_output_is_connected(output)) continue; + data->connected_output[data->connected_outputs++] = output; igt_assert(kmstest_get_connector_default_mode( data->fd, output->config.connector, &data->mode[i])); @@ -173,7 +189,7 @@ static void force_output_mode(data_t *d, igt_output_t *output, igt_output_override_mode(output, mode); } -static void run_test_linear_tiling(data_t *data, int pipe, const drmModeModeInfo *mode) { +static void run_test_linear_tiling(data_t *data, int pipe, const drmModeModeInfo *mode, bool physical) { igt_display_t *display = &data->display; igt_output_t *output; struct igt_fb buffer[IGT_MAX_PIPES]; @@ -189,11 +205,14 @@ static void run_test_linear_tiling(data_t *data, int pipe, const drmModeModeInfo igt_skip_on_f(pipe >= num_pipes, "ASIC does not have %d pipes\n", pipe); - test_init(data); + test_init(data, physical); + + igt_skip_on_f(physical && pipe >= data->connected_outputs, + "Only %d connected need %d connected\n",data->connected_outputs, pipe+1); /* create buffers */ for (i = 0; i <= pipe; i++) { - output = data->output[i]; + output = physical ? data->connected_output[i] : data->output[i]; if (!output) { continue; } @@ -208,6 +227,8 @@ static void run_test_linear_tiling(data_t *data, int pipe, const drmModeModeInfo igt_output_set_pipe(output, i); igt_plane_set_fb(data->primary[i], &buffer[i]); + igt_info("Assigning pipe %s to output %s with mode %s\n", + kmstest_pipe_name(i), igt_output_name(output), mode->name); } ret = igt_display_try_commit_atomic(display, @@ -219,7 +240,7 @@ static void run_test_linear_tiling(data_t *data, int pipe, const drmModeModeInfo igt_display_commit_atomic(display, DRM_MODE_ATOMIC_ALLOW_MODESET, NULL); for (i = 0; i <= pipe; i++) { - output = data->output[i]; + output = physical ? data->connected_output[i] : data->output[i]; if (!output) { continue; } @@ -230,7 +251,7 @@ static void run_test_linear_tiling(data_t *data, int pipe, const drmModeModeInfo } for (i = pipe; i >= 0; i--) { - output = data->output[i]; + output = physical ? data->connected_output[i] : data->output[i]; if (!output) continue; @@ -265,10 +286,19 @@ igt_main for (j = 0; j < ARRAY_SIZE(test_mode); j++) { igt_subtest_f("linear-tiling-%d-displays-%s", i+1, test_mode[j].name) - run_test_linear_tiling(&data, i, &test_mode[j]); + run_test_linear_tiling(&data, i, &test_mode[j], false); } } + for (i = 0; i < IGT_MAX_PIPES; i++) { + for (j = 0; j < ARRAY_SIZE(test_mode); j++) { + igt_subtest_f("connected-linear-tiling-%d-displays-%s", i+1, + test_mode[j].name) + run_test_linear_tiling(&data, i, &test_mode[j], true); + } + } + + igt_fixture { igt_display_fini(&data.display); -- 2.25.1