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 3A73EC02181 for ; Sun, 26 Jan 2025 18:04:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C051E10E19C; Sun, 26 Jan 2025 18:04:03 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="diYMGA/d"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8615A10E19C for ; Sun, 26 Jan 2025 18:04:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1737914643; x=1769450643; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=6EcnqL81jN9vwnZ8gy9tdAMmLOLfhKvciP5r6iwjagw=; b=diYMGA/d1hwlCrfG5hVbzhc33kA1xZEoP4kO4kmOLF5bbE0IIvmi63BP FrurSq7ZILMpKs5MfiwysMP+R58ge9Ac9eiJvmxMBp3Zm9ju53CRECE2y uZO5QHyeiSbnNMtc4K3/sSjzsDTCCBGdyBnY63puUKKsVxj/EyuClFGpJ MqTYCZbua3jiVGRm1xk+8Eo9H9py0MFbGojhJnGm43Rl1iTIg39ariM5P 1JL4eS+fSsUoF0U+eLxm4Dv/gLU6eQC8VSVTk41+1girLNtbAdTUeZEYz Q6BKAagaruVcKAS+GsRLRe/sIVYEimvGiZFjUfnpGODe/SfTPZ3FFN02o g==; X-CSE-ConnectionGUID: I7Ll98sgQLCci4GS0E0OZg== X-CSE-MsgGUID: nG3qlRXVRo2Z8ETqWgyyFA== X-IronPort-AV: E=McAfee;i="6700,10204,11327"; a="38551986" X-IronPort-AV: E=Sophos;i="6.13,236,1732608000"; d="scan'208";a="38551986" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jan 2025 10:04:02 -0800 X-CSE-ConnectionGUID: N5NeUrlUTE6+ZprWcE+9qw== X-CSE-MsgGUID: mpX9BGshS5SAjX7BdzFE2Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,236,1732608000"; d="scan'208";a="108032550" Received: from kunal-x299-aorus-gaming-3-pro.iind.intel.com ([10.190.239.13]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jan 2025 10:04:00 -0800 From: Jeevan B To: igt-dev@lists.freedesktop.org Cc: karthik.b.s@intel.com, Jeevan B Subject: [PATCH i-g-t] tests/intel/kms_joiner: Add a new test to validate non-joiner mode Date: Sun, 26 Jan 2025 23:49:31 +0530 Message-Id: <20250126181931.3356853-1-jeevan.b@intel.com> X-Mailer: git-send-email 2.25.1 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" We need to ensure that the system does not use a joiner for modes that do not require it. This test will validate that the correct non-joiner mode is selected, and then forcing a modeset and flip on the last pipe. If the joiner is mistakenly enabled for a non-joiner mode, the test should fail. otherwise, the commit should proceed as expected. v2: Fix nonjoiner_mode_found to find the required case(6K@30). Remove clk sort and minor fixes. (Karthik) Signed-off-by: Jeevan B --- tests/intel/kms_joiner.c | 78 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/tests/intel/kms_joiner.c b/tests/intel/kms_joiner.c index 086cfeb71..3d9fa095b 100644 --- a/tests/intel/kms_joiner.c +++ b/tests/intel/kms_joiner.c @@ -74,6 +74,9 @@ * * SUBTEST: switch-modeset-ultra-joiner-big-joiner * Description: Verify switching between ultra joiner and big joiner modeset. + * + * SUBTEST: basic-non-joiner + * Description: Vefiry basic non-joiner mode across all pipes. */ IGT_TEST_DESCRIPTION("Test joiner / force joiner"); @@ -85,6 +88,7 @@ typedef struct { int ultra_joiner_output_count; int non_big_joiner_output_count; int non_ultra_joiner_output_count; + int nonjoiner_output_count; int mixed_output_count; int output_count; int n_pipes; @@ -94,6 +98,7 @@ typedef struct { igt_output_t *non_big_joiner_output[IGT_MAX_PIPES]; igt_output_t *non_ultra_joiner_output[IGT_MAX_PIPES]; igt_output_t *mixed_output[IGT_MAX_PIPES]; + igt_output_t *nonjoiner_output[IGT_MAX_PIPES]; enum pipe pipe_seq[IGT_MAX_PIPES]; igt_display_t display; } data_t; @@ -164,6 +169,23 @@ static enum pipe setup_pipe(data_t *data, igt_output_t *output, enum pipe pipe, return master_pipe; } +static bool nonjoiner_mode_found(int drm_fd, drmModeConnector *connector, + drmModeModeInfo *mode) +{ + igt_sort_connector_modes(connector, sort_drm_modes_by_res_dsc); + + for (int i = 0; i < connector->count_modes; i++) { + drmModeModeInfo *current_mode = &connector->modes[i]; + + if ((current_mode->hdisplay == 6144 && current_mode->vrefresh == 30) || + mode->clock < max_dotclock) { + *mode = *current_mode; + return true; + } + } + return false; +} + static void set_joiner_mode(data_t *data, igt_output_t *output, drmModeModeInfo *mode) { igt_plane_t *primary; @@ -491,6 +513,48 @@ static void test_ultra_joiner(data_t *data, bool invalid_pipe, bool two_display, } } +static void test_single_non_joiner(data_t *data) +{ + int count; + igt_output_t **outputs, *output; + igt_fb_t fb; + igt_plane_t *primary; + drmModeModeInfo mode; + drmModeConnector *con; + + count = data->nonjoiner_output_count; + outputs = data->nonjoiner_output; + igt_display_reset(&data->display); + igt_display_commit2(&data->display, COMMIT_ATOMIC); + + for (int i = 0; i < count; i++) { + output = outputs[i]; + con = output->config.connector; + + if (nonjoiner_mode_found(data->drm_fd, con, &mode)) { + igt_output_override_mode(output, &mode); + igt_info("Assigning pipe %s to %s with mode %dx%d@%d\n", + kmstest_pipe_name(data->pipe_seq[data->n_pipes - 1]), + igt_output_name(output), mode.hdisplay, + mode.vdisplay, mode.vrefresh); + + igt_output_set_pipe(output, data->pipe_seq[data->n_pipes - 1]); + + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); + + igt_create_pattern_fb(data->drm_fd, mode.hdisplay, mode.vdisplay, DRM_FORMAT_XRGB8888, + DRM_FORMAT_MOD_LINEAR, &fb); + + igt_plane_set_fb(primary, &fb); + igt_assert(igt_display_try_commit2(&data->display, COMMIT_ATOMIC)); + igt_plane_set_fb(primary, NULL); + igt_remove_fb(data->drm_fd, &fb); + } else { + igt_warn("No valid non-joiner mode found for output %s\n", igt_output_name(output)); + } + } +} + igt_main { bool ultra_joiner_supported, is_dgfx; @@ -505,6 +569,7 @@ igt_main data.ultra_joiner_output_count = 0; data.non_big_joiner_output_count = 0; data.non_ultra_joiner_output_count = 0; + data.nonjoiner_output_count = 0; data.mixed_output_count = 0; data.output_count = 0; j = 0; @@ -523,6 +588,7 @@ igt_main for_each_connected_output(&data.display, output) { bool ultrajoiner_found = false, bigjoiner_found = false, force_joiner_supported = false; + bool nonjoiner_found = false; drmModeConnector *connector = output->config.connector; /* @@ -533,6 +599,7 @@ igt_main */ bigjoiner_found = bigjoiner_mode_found(data.drm_fd, connector, max_dotclock, &mode); ultrajoiner_found = ultrajoiner_mode_found(data.drm_fd, connector, max_dotclock, &mode); + nonjoiner_found = nonjoiner_mode_found(data.drm_fd, connector, &mode); if (igt_has_force_joiner_debugfs(data.drm_fd, output->name)) force_joiner_supported = true; @@ -548,6 +615,9 @@ igt_main else if (force_joiner_supported) data.non_big_joiner_output[data.non_big_joiner_output_count++] = output; + if (nonjoiner_found) + data.nonjoiner_output[data.nonjoiner_output_count++] = output; + data.output_count++; } if (data.big_joiner_output_count == 1 && data.non_big_joiner_output_count >= 1) { @@ -713,6 +783,14 @@ igt_main } } + igt_describe("Verify the basic modeset on big joiner mode on all pipes"); + igt_subtest_with_dynamic("basic-non-joiner") { + igt_require_f(data.n_pipes >= 1, + "Minimum of 1 pipes are required\n"); + igt_dynamic_f("non-joiner") + test_single_non_joiner(&data); + } + igt_fixture { igt_display_fini(&data.display); drm_close_driver(data.drm_fd); -- 2.25.1