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 26D30D12D61 for ; Mon, 11 Nov 2024 15:32:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CC45410E166; Mon, 11 Nov 2024 15:32:06 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="foKX2C5v"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4313210E166 for ; Mon, 11 Nov 2024 15:32:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1731339124; x=1762875124; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=ZVeN587Uldxz586ff6y2n1pOVB1yj3KC/kb9hJ+hkq8=; b=foKX2C5vuR9zfvKSMQVYCgGOFlQ/c8xLzjIMs03s9NuNASgaVehI4/mP +7MnOSjqcfBNOCVjcMDtNpuQH70fY3/ZrQfuvLMHh0vnDeeCRJOiiidYb lQVEmubZijleO5jNxpjTEvVJzBbgaU3hk912iP6+jZBbuNcuo1YRsctZb OLfitY7lncz6wtsWXGVFvk64Ss9up3k0QRt0WNi3sK1l6JnGSmAI9BCLI h4ovxG13Cz1810tvYQiATchiusHiBaatIst0h5e+T07/Z7rTc5J6hoyFs Bwm0N392voMDvYvaJtoyMTa/M82RhGw1vL5PSwQW5VyirdiMI4b09bMcq A==; X-CSE-ConnectionGUID: W1I1ls19QFWZoag1oYy+BQ== X-CSE-MsgGUID: f7lpN0eOQxy0+j7XCTQ75A== X-IronPort-AV: E=McAfee;i="6700,10204,11253"; a="30541336" X-IronPort-AV: E=Sophos;i="6.12,145,1728975600"; d="scan'208";a="30541336" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2024 07:32:03 -0800 X-CSE-ConnectionGUID: Roumc4reSV2IGNn7+TeZyg== X-CSE-MsgGUID: jigSM33bTv6Prchp4TN4dw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,145,1728975600"; d="scan'208";a="87338904" Received: from kunal-x299-aorus-gaming-3-pro.iind.intel.com ([10.190.239.13]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2024 07:32:03 -0800 From: Jeevan B To: igt-dev@lists.freedesktop.org Cc: Jeevan B Subject: [PATCH i-g-t] lib/igt_kms: Add 6k resolution support for a single CRTC Date: Mon, 11 Nov 2024 21:16:35 +0530 Message-Id: <20241111154635.1304517-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" increase big_joiner limitation to 6k from 5k for display version greater than 30. Apart from lib following tests are modified: tests/intel/kms_pm_lpsp.c tests/kms_flip.c tests/kms_setmode.c Signed-off-by: Jeevan B --- lib/igt_kms.c | 21 ++++++++++++++------- lib/igt_kms.h | 5 +++-- tests/intel/kms_pm_lpsp.c | 4 ++-- tests/kms_display_modes.c | 6 ++++++ tests/kms_flip.c | 4 ++-- tests/kms_setmode.c | 4 ++-- 6 files changed, 29 insertions(+), 15 deletions(-) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 5d8096a17..f5bb488df 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -6330,6 +6330,7 @@ int igt_get_max_dotclock(int fd) /** * igt_bigjoiner_possible: + * @fd: drm file descriptor * @mode: libdrm mode * @max_dotclock: Max pixel clock frequency * @@ -6338,9 +6339,13 @@ int igt_get_max_dotclock(int fd) * * Returns: True if mode requires Bigjoiner, else False. */ -bool igt_bigjoiner_possible(drmModeModeInfo *mode, int max_dotclock) +bool igt_bigjoiner_possible(int fd, drmModeModeInfo *mode, int max_dotclock) { - return (mode->hdisplay > MAX_HDISPLAY_PER_PIPE || + int max_hdisplay, dev_id; + dev_id = intel_get_drm_devid(fd); + max_hdisplay = (intel_display_ver(dev_id) >= 30) ? HDISPLAY_6K_PER_PIPE : + HDISPLAY_5K_PER_PIPE; + return (mode->hdisplay > max_hdisplay || mode->clock > max_dotclock); } @@ -6362,10 +6367,10 @@ bool bigjoiner_mode_found(int drm_fd, drmModeConnector *connector, bool found = false; igt_sort_connector_modes(connector, sort_drm_modes_by_res_dsc); - found = igt_bigjoiner_possible(&connector->modes[0], max_dotclock); + found = igt_bigjoiner_possible(drm_fd, &connector->modes[0], max_dotclock); if (!found) { igt_sort_connector_modes(connector, sort_drm_modes_by_clk_dsc); - found = igt_bigjoiner_possible(&connector->modes[0], max_dotclock); + found = igt_bigjoiner_possible(drm_fd, &connector->modes[0], max_dotclock); } if (found) *mode = connector->modes[0]; @@ -6384,7 +6389,7 @@ bool bigjoiner_mode_found(int drm_fd, drmModeConnector *connector, */ bool igt_ultrajoiner_possible(drmModeModeInfo *mode, int max_dotclock) { - return (mode->hdisplay > 2 * MAX_HDISPLAY_PER_PIPE || + return (mode->hdisplay > 2 * HDISPLAY_5K_PER_PIPE || mode->clock > 2 * max_dotclock); } @@ -6549,7 +6554,8 @@ bool igt_check_bigjoiner_support(igt_display_t *display) * - current & previous crtcs are consecutive */ for (i = 0; i < pipes_in_use; i++) { - if (pipes[i].force_joiner || igt_bigjoiner_possible(pipes[i].mode, max_dotclock)) { + if (pipes[i].force_joiner || igt_bigjoiner_possible(display->drm_fd, pipes[i].mode, + max_dotclock)) { igt_info("pipe-%s-%s: (Max dot-clock: %d KHz), force joiner: %s\n", kmstest_pipe_name(pipes[i].idx), igt_output_name(pipes[i].output), @@ -6576,7 +6582,8 @@ bool igt_check_bigjoiner_support(igt_display_t *display) } } - if ((i > 0) && (pipes[i - 1].force_joiner || igt_bigjoiner_possible(pipes[i - 1].mode, max_dotclock))) { + if ((i > 0) && (pipes[i - 1].force_joiner || igt_bigjoiner_possible(display->drm_fd, + pipes[i - 1].mode, max_dotclock))) { igt_info("pipe-%s-%s: (Max dot-clock: %d KHz), force joiner: %s\n", kmstest_pipe_name(pipes[i - 1].idx), igt_output_name(pipes[i - 1].output), diff --git a/lib/igt_kms.h b/lib/igt_kms.h index bd154d1c1..a1d2b8632 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -146,7 +146,8 @@ const char *kmstest_scaling_filter_str(int filter); const char *kmstest_dsc_output_format_str(int output_format); void kmstest_dump_mode(drmModeModeInfo *mode); -#define MAX_HDISPLAY_PER_PIPE 5120 +#define HDISPLAY_6K_PER_PIPE 6144 +#define HDISPLAY_5K_PER_PIPE 5120 int kmstest_get_pipe_from_crtc_id(int fd, int crtc_id); void kmstest_set_vt_graphics_mode(void); @@ -1238,7 +1239,7 @@ void igt_sort_connector_modes(drmModeConnector *connector, bool igt_max_bpc_constraint(igt_display_t *display, enum pipe pipe, igt_output_t *output, int bpc); int igt_get_max_dotclock(int fd); -bool igt_bigjoiner_possible(drmModeModeInfo *mode, int max_dotclock); +bool igt_bigjoiner_possible(int fd, drmModeModeInfo *mode, int max_dotclock); bool bigjoiner_mode_found(int drm_fd, drmModeConnector *connector, int max_dotclock, drmModeModeInfo *mode); bool igt_ultrajoiner_possible(drmModeModeInfo *mode, int max_dotclock); diff --git a/tests/intel/kms_pm_lpsp.c b/tests/intel/kms_pm_lpsp.c index 889da42de..74e9d799a 100644 --- a/tests/intel/kms_pm_lpsp.c +++ b/tests/intel/kms_pm_lpsp.c @@ -166,11 +166,11 @@ static bool test_constraint(data_t *data) if (igt_check_force_joiner_status(data->drm_fd, data->output->name)) return false; - if (igt_bigjoiner_possible(mode, max_dotclock)) { + if (igt_bigjoiner_possible(data->drm_fd, mode, max_dotclock)) { for_each_connector_mode(data->output) { mode = &data->output->config.connector->modes[j__]; - if (igt_bigjoiner_possible(mode, max_dotclock)) + if (igt_bigjoiner_possible(data->drm_fd, mode, max_dotclock)) continue; igt_output_override_mode(data->output, mode); diff --git a/tests/kms_display_modes.c b/tests/kms_display_modes.c index f1d8ab03d..0950cc483 100644 --- a/tests/kms_display_modes.c +++ b/tests/kms_display_modes.c @@ -318,6 +318,12 @@ igt_main igt_display_require_output(&data.display); for_each_connected_output(&data.display, output) { + drmModeConnector *connector = output->config.connector; + drmModeModeInfo mode; + int max_dotclock = igt_get_max_dotclock(data.drm_fd); + + igt_require_f(!bigjoiner_mode_found(data.drm_fd, connector, max_dotclock, &mode), + "Big Joiner Connector Found Unsupported Config\n"); data.mst_output[count++] = output; if (output_is_dp_mst(&data, output, dp_mst_outputs)) dp_mst_outputs++; diff --git a/tests/kms_flip.c b/tests/kms_flip.c index cbabbe74f..17da10e2e 100755 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -1756,11 +1756,11 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs, o->kconnector[i - 1]->connector_type_id); if (((igt_check_force_joiner_status(drm_fd, conn_name) || - igt_bigjoiner_possible(&o->kmode[i], max_dotclock)) && + igt_bigjoiner_possible(drm_fd, &o->kmode[i], max_dotclock)) && ((crtc_idxs[i] >= (total_crtcs - 1)) || ((i < (crtc_count - 1)) && (abs(crtc_idxs[i + 1] - crtc_idxs[i]) <= 1)))) || ((i > 0) && (igt_check_force_joiner_status(drm_fd, prev_conn_name) || - igt_bigjoiner_possible(&o->kmode[i - 1], max_dotclock)) && + igt_bigjoiner_possible(drm_fd, &o->kmode[i - 1], max_dotclock)) && (abs(crtc_idxs[i] - crtc_idxs[i - 1]) <= 1))) { igt_debug("Combo: %s is not possible with selected mode(s).\n", test_name); diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c index bc7b8fabb..d61cfeb9a 100644 --- a/tests/kms_setmode.c +++ b/tests/kms_setmode.c @@ -736,11 +736,11 @@ static void test_one_combination(const struct test_config *tconf, * - current & previous crtcs are consecutive */ if (((igt_check_force_joiner_status(drm_fd, conn_name) || - igt_bigjoiner_possible(&crtc->mode, max_dotclock)) && + igt_bigjoiner_possible(drm_fd, &crtc->mode, max_dotclock)) && ((crtc->crtc_idx >= (tconf->resources->count_crtcs - 1)) || ((i < (crtc_count - 1)) && (abs(crtcs[i + 1].crtc_idx - crtc->crtc_idx) <= 1)))) || ((i > 0) && (igt_check_force_joiner_status(drm_fd, prev_conn_name) || - igt_bigjoiner_possible(&crtc[i - 1].mode, max_dotclock)) && + igt_bigjoiner_possible(drm_fd, &crtc[i - 1].mode, max_dotclock)) && (abs(crtc->crtc_idx - crtcs[i - 1].crtc_idx) <= 1))) { igt_info("Combo: %s is not possible with selected mode(s).\n", test_name); goto out; -- 2.25.1