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 0D04DC02180 for ; Wed, 15 Jan 2025 07:17:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 99C7610E4E1; Wed, 15 Jan 2025 07:17:12 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="gf7Kb8ld"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3C68510E4E1 for ; Wed, 15 Jan 2025 07:17:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1736925431; x=1768461431; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nAbcFwvKaUFHEIWvbi+DKuw3AtJkuMRPbX51snHU7bU=; b=gf7Kb8ld2HIqEaneXhmv5Hci+n3WmfXqlAxbXKTnYqgukOAEl51WrTDn rbf9mSGx4OOjQLvBH2bZZSTYm7Mr9Ewg8DiVOF716m/rF1Y5is21ebctU mleM26bkvVs0QH7xM+irqsS8YkQt+rUV6BWj05dcZ0dZs3N8nIz4MzJXI KiXfCxOIN2Hkl0vpI2Y2n98tzG2sL09qg8S5flQCEg8hzTtn2zl0Wltpq 6Lvp0kgMzy7/Pg/Mfwns4PzHRnuHfGUeBRP1an7ir/06i4pnZCJFteUlp KrcqTs+CkKQY1rDwfUaw6vf3qxPKo6da6GVemEZxJQrEiDH6Q9Ikf10GV g==; X-CSE-ConnectionGUID: sBQgOfzZQ/+M8tGym1lUQA== X-CSE-MsgGUID: 4K4ekuebScuL5r2dld6xDQ== X-IronPort-AV: E=McAfee;i="6700,10204,11315"; a="40927879" X-IronPort-AV: E=Sophos;i="6.12,316,1728975600"; d="scan'208";a="40927879" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jan 2025 23:17:11 -0800 X-CSE-ConnectionGUID: MhgbW7h7SEOmWTkxftHCnQ== X-CSE-MsgGUID: 0jUrVUYXRvaqMmwb3i6rrA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,316,1728975600"; d="scan'208";a="110008230" Received: from kunal-x299-aorus-gaming-3-pro.iind.intel.com ([10.190.239.13]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jan 2025 23:17:10 -0800 From: Kunal Joshi To: igt-dev@lists.freedesktop.org Cc: Kunal Joshi , Jeevan B Subject: [PATCH 2/4] tests/intel/kms_mst_helper: Add helper for MST-related functions Date: Wed, 15 Jan 2025 13:02:41 +0530 Message-Id: <20250115073243.2002014-3-kunal1.joshi@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250115073243.2002014-1-kunal1.joshi@intel.com> References: <20250115073243.2002014-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" This patch introduces kms_mst_helper.c and kms_mst_helper.h to centralize commonly used MST-related logic. The new function igt_find_all_mst_output_in_topology() enumerates MST outputs that share the same root connector, simplifying code reuse across tests needing outputs on same MST topology. The existing MST-related code in kms_dp_linktrain_fallback.c is updated to use the new helper, removing duplication. Additionally, meson.build is modified to include kms_mst_helper.c in the build process. Signed-off-by: Kunal Joshi Reviewed-by: Jeevan B --- tests/intel/kms_dp_linktrain_fallback.c | 28 +++------------ tests/intel/kms_mst_helper.c | 48 +++++++++++++++++++++++++ tests/intel/kms_mst_helper.h | 10 ++++++ tests/meson.build | 1 + 4 files changed, 63 insertions(+), 24 deletions(-) create mode 100644 tests/intel/kms_mst_helper.c create mode 100644 tests/intel/kms_mst_helper.h diff --git a/tests/intel/kms_dp_linktrain_fallback.c b/tests/intel/kms_dp_linktrain_fallback.c index a05e2015f..b10946781 100644 --- a/tests/intel/kms_dp_linktrain_fallback.c +++ b/tests/intel/kms_dp_linktrain_fallback.c @@ -16,6 +16,7 @@ #include #include "igt.h" +#include "kms_mst_helper.h" /** * SUBTEST: dp-fallback @@ -47,28 +48,6 @@ typedef int (*condition_check_fn)(int drm_fd, igt_output_t *output); IGT_TEST_DESCRIPTION("Test link training fallback"); -static void find_mst_outputs(int drm_fd, data_t *data, - igt_output_t *output, - igt_output_t *mst_outputs[], - int *num_mst_outputs) -{ - int output_root_id, root_id; - igt_output_t *connector_output; - - output_root_id = igt_get_dp_mst_connector_id(output); - /* - * If output is MST check all other connected output which shares - * same path and fill mst_outputs and num_mst_outputs - */ - for_each_connected_output(&data->display, connector_output) { - if (!igt_check_output_is_dp_mst(connector_output)) - continue; - root_id = igt_get_dp_mst_connector_id(connector_output); - if (((*num_mst_outputs) < IGT_MAX_PIPES) && root_id == output_root_id) - mst_outputs[(*num_mst_outputs)++] = connector_output; - } -} - static bool setup_mst_outputs(data_t *data, igt_output_t *mst_output[], int *output_count) { @@ -83,8 +62,9 @@ static bool setup_mst_outputs(data_t *data, igt_output_t *mst_output[], traversed_mst_outputs[i] == data->output->config.connector->connector_id) return false; - find_mst_outputs(data->drm_fd, data, data->output, - mst_output, output_count); + igt_assert_f(igt_find_all_mst_output_in_topology(data->drm_fd, &data->display, data->output, + mst_output, output_count), + "Unable to find mst outputs\n"); for (i = 0; i < *output_count; i++) { output = mst_output[i]; diff --git a/tests/intel/kms_mst_helper.c b/tests/intel/kms_mst_helper.c new file mode 100644 index 000000000..9d52068f7 --- /dev/null +++ b/tests/intel/kms_mst_helper.c @@ -0,0 +1,48 @@ +#include "kms_mst_helper.h" + +/* + * @drm_fd: DRM file descriptor + * @display: pointer to an #igt_display_t structure + * @output: target output + * @mst_outputs: filled with mst output of same toplogy as @output + * @num_mst_outputs: filled with count of mst outputs found in topology + * @n_pipes: total number of pipes available + * @used_pipes_mask: pointer to a bitmask (in/out) of already-used pipes + * @master_pipes_mask: bitmask of valid "master" pipes + * @valid_pipes_mask: bitmask of valid (non-fused) pipes + * + * Assign pipes to outputs based on the number of required pipes. + * This function will assign 1, 2, or 4 consecutive pipes to each output. + * It will also mark the used pipes in the bitmask. + * + * Returns: true if all outputs can be assigned successfully; false otherwise. + */ +bool igt_find_all_mst_output_in_topology(int drm_fd, igt_display_t *display, + igt_output_t *output, + igt_output_t *mst_outputs[], + int *num_mst_outputs) +{ + int output_root_id, root_id; + igt_output_t *connector_output; + + if (!igt_check_output_is_dp_mst(output)) + return false; + + output_root_id = igt_get_dp_mst_connector_id(output); + if (output_root_id == -EINVAL) + return false; + + /* + * If output is MST, check all other connected output which shares + * same path and fill mst_outputs and num_mst_outputs + */ + for_each_connected_output(display, connector_output) { + if (!igt_check_output_is_dp_mst(connector_output)) + continue; + + root_id = igt_get_dp_mst_connector_id(connector_output); + if (((*num_mst_outputs) < IGT_MAX_PIPES) && root_id == output_root_id) + mst_outputs[(*num_mst_outputs)++] = connector_output; + } + return true; +} diff --git a/tests/intel/kms_mst_helper.h b/tests/intel/kms_mst_helper.h new file mode 100644 index 000000000..291fcebfe --- /dev/null +++ b/tests/intel/kms_mst_helper.h @@ -0,0 +1,10 @@ +#ifndef KMS_MST_HELPER_H +#define KMS_MST_HELPER_H + +#include "igt.h" + +bool igt_find_all_mst_output_in_topology(int drm_fd, igt_display_t *display, + igt_output_t *output, + igt_output_t *mst_outputs[], + int *num_mst_outputs); +#endif diff --git a/tests/meson.build b/tests/meson.build index cb09df288..6418899ca 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -367,6 +367,7 @@ extra_sources = { 'kms_chamelium_hpd': [ join_paths ('chamelium', 'kms_chamelium_helper.c') ], 'kms_dsc': [ join_paths ('intel', 'kms_dsc_helper.c') ], 'kms_joiner': [join_paths ('intel', 'kms_joiner_helper.c')], + 'kms_dp_linktrain_fallback': [join_paths ('intel', 'kms_mst_helper.c')], 'kms_psr2_sf': [ join_paths ('intel', 'kms_dsc_helper.c') ], } -- 2.25.1