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 37BD5C3DA4A for ; Wed, 14 Aug 2024 18:53:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8A27F10E518; Wed, 14 Aug 2024 18:53:57 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KNzbcdwG"; dkim-atps=neutral Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by gabe.freedesktop.org (Postfix) with ESMTPS id CBCBF10E518 for ; Wed, 14 Aug 2024 18:53:55 +0000 (UTC) Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2cb510cd097so73633a91.1 for ; Wed, 14 Aug 2024 11:53:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723661634; x=1724266434; darn=lists.freedesktop.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=TOomdDOY/IVIcWNRs3RndFASvhxjxpWKMkbZZV2GZ6Y=; b=KNzbcdwGvPnNgjFnJjOd2LYMA6taNOnrWMKO53AaKczndIK59xHC4SwSk1aQypDPBP lVbL9j/uzvtmjHCAAuLHc+beLCi/KDFbyu3XGbwi3jLSjktCd1E4gxALktqHR23LLY2n GajpIbReEDI0LcldDF+XzC/S8GlISYjPfiFd7QeG/rs+ebC6/BdBfbX6IqsRd/W3fYOY 1gei+5+aAxs5+nUc426t/O87Nu+InQdotKMpP2Jiz9O8R4Ku74exn8qvv5I7V49/tQmp fOWhZSTICvo5NjGfvps/40ynQGw6SVixZycniqWDvGKDIvaLXCByGaYv/8A7Ef/iO7M1 U73A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723661634; x=1724266434; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=TOomdDOY/IVIcWNRs3RndFASvhxjxpWKMkbZZV2GZ6Y=; b=jDkjd6EACcQ0/iTOxL1Hdq0ZGNox2TD5AmOuhp696WjLgeCWzxk4QW8T4rgSsLf/59 sa5R+YBxWQ96dp8nWJbjFSjXRldAAwhSMpfTKPfRGrOVW07Y9QJrHaFtgQu1P1AqsdBw OI6NboQs+gMm3tOlOa6YZFmz1iJ+9HN5n/z1yD/DuhhYuFO+iI/6zagFTebV5TXNTikg RJIHuXDViENZ84KoY4zfbHkYdViQUembK/zSA9w1M2dw62HpbBamf+oIpj3PKcPPPOcO LO6pwihZ8ymrb9Nt8kdk0+Fr/lDkZVfvLFTjQBCpn0ldVPfAWvXGPJAA1ShqxCFfls13 T0Cw== X-Gm-Message-State: AOJu0YyRrWh1/GSyvcvOtFxUgeCktLIT9+8hU5ul/p1HjtUoNDR5mcsV TKijpkfd8dsYixdrS3Xp5z4t6g2LytG8uveNjq2d1sEU+7zflcUyiIFxvQ== X-Google-Smtp-Source: AGHT+IGqr+7NnmaS07APH2KNxoiRzO0PqZDrc8RCLZTL57i75MWJUsPdqRR7ON/smeBwmTo4cuq6MQ== X-Received: by 2002:a17:90b:1b48:b0:2bd:d42a:e071 with SMTP id 98e67ed59e1d1-2d3aab48fc3mr4257724a91.30.1723661634101; Wed, 14 Aug 2024 11:53:54 -0700 (PDT) Received: from localhost ([2a00:79e1:2e00:1301:12e9:d196:a1e9:ab67]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2d3ac8306a6sm2116992a91.52.2024.08.14.11.53.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Aug 2024 11:53:53 -0700 (PDT) From: Rob Clark To: igt-dev@lists.freedesktop.org Cc: Rob Clark Subject: [PATCH 1/2] tests/kms_plane_scaling: Pass display to get_num_scalers() Date: Wed, 14 Aug 2024 11:53:38 -0700 Message-ID: <20240814185339.70097-1-robdclark@gmail.com> X-Mailer: git-send-email 2.46.0 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" From: Rob Clark Prep for next patch. The next commit will need the display to figure out the # of scalers. This commit has no functional change, just plumbing the extra parameter everywhere. Signed-off-by: Rob Clark --- lib/igt_kms.c | 5 +++-- lib/igt_kms.h | 2 +- tests/kms_plane_scaling.c | 24 ++++++++++++------------ 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index e030b35a6051..99cdeeb76033 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -6650,17 +6650,18 @@ int igt_get_dp_mst_connector_id(igt_output_t *output) /** * get_num_scalers: - * @drm_fd: drm file descriptor + * @display: the display * @pipe: display pipe * * Returns: Number of scalers supported per pipe. */ -int get_num_scalers(int drm_fd, enum pipe pipe) +int get_num_scalers(igt_display_t *display, enum pipe pipe) { char buf[8120]; char *start_loc1, *start_loc2; int dir, res; int num_scalers = 0; + int drm_fd = display->drm_fd; char dest[20] = ":pipe "; strcat(dest, kmstest_pipe_name(pipe)); diff --git a/lib/igt_kms.h b/lib/igt_kms.h index e8582a45b53e..25ba509164e3 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -1223,6 +1223,6 @@ bool igt_parse_mode_string(const char *mode_string, drmModeModeInfo *mode); bool intel_pipe_output_combo_valid(igt_display_t *display); bool igt_check_output_is_dp_mst(igt_output_t *output); int igt_get_dp_mst_connector_id(igt_output_t *output); -int get_num_scalers(int drm_fd, enum pipe pipe); +int get_num_scalers(igt_display_t *display, enum pipe pipe); #endif /* __IGT_KMS_H__ */ diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c index 90bfb004773b..42eb67409899 100644 --- a/tests/kms_plane_scaling.c +++ b/tests/kms_plane_scaling.c @@ -1080,8 +1080,8 @@ static void test_scaler_with_multi_pipe_plane(data_t *d) igt_output_set_pipe(output1, pipe1); igt_output_set_pipe(output2, pipe2); - igt_require(get_num_scalers(d->drm_fd, pipe1) >= 2); - igt_require(get_num_scalers(d->drm_fd, pipe2) >= 2); + igt_require(get_num_scalers(display, pipe1) >= 2); + igt_require(get_num_scalers(display, pipe2) >= 2); plane[0] = igt_output_get_plane(output1, 0); igt_require(plane[0]); @@ -1169,7 +1169,7 @@ static void invalid_parameter_tests(data_t *d) igt_output_set_pipe(output, pipe); plane = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); - igt_require(get_num_scalers(d->drm_fd, pipe) >= 1); + igt_require(get_num_scalers(&d->display, pipe) >= 1); igt_create_fb(d->drm_fd, 256, 256, DRM_FORMAT_XRGB8888, @@ -1346,7 +1346,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data) for_each_valid_output_on_pipe(&data.display, pipe, output) { if (!pipe_output_combo_valid(&data.display, pipe, output)) continue; - if (get_num_scalers(data.drm_fd, pipe) < 1) + if (get_num_scalers(&data.display, pipe) < 1) continue; igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) { @@ -1370,7 +1370,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data) for_each_valid_output_on_pipe(&data.display, pipe, output) { if (!pipe_output_combo_valid(&data.display, pipe, output)) continue; - if (get_num_scalers(data.drm_fd, pipe) < 1) + if (get_num_scalers(&data.display, pipe) < 1) continue; igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) { @@ -1394,7 +1394,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data) for_each_valid_output_on_pipe(&data.display, pipe, output) { if (!pipe_output_combo_valid(&data.display, pipe, output)) continue; - if (get_num_scalers(data.drm_fd, pipe) < 1) + if (get_num_scalers(&data.display, pipe) < 1) continue; igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) { @@ -1417,7 +1417,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data) for_each_valid_output_on_pipe(&data.display, pipe, output) { if (!pipe_output_combo_valid(&data.display, pipe, output)) continue; - if (get_num_scalers(data.drm_fd, pipe) < 1) + if (get_num_scalers(&data.display, pipe) < 1) continue; igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) { @@ -1437,7 +1437,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data) for_each_valid_output_on_pipe(&data.display, pipe, output) { if (!pipe_output_combo_valid(&data.display, pipe, output)) continue; - if (get_num_scalers(data.drm_fd, pipe) < 1) + if (get_num_scalers(&data.display, pipe) < 1) continue; igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) { @@ -1457,7 +1457,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data) for_each_valid_output_on_pipe(&data.display, pipe, output) { if (!pipe_output_combo_valid(&data.display, pipe, output)) continue; - if (get_num_scalers(data.drm_fd, pipe) < 1) + if (get_num_scalers(&data.display, pipe) < 1) continue; igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) { @@ -1477,7 +1477,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data) for_each_valid_output_on_pipe(&data.display, pipe, output) { if (!pipe_output_combo_valid(&data.display, pipe, output)) continue; - if (get_num_scalers(data.drm_fd, pipe) < 2) + if (get_num_scalers(&data.display, pipe) < 2) continue; igt_dynamic_f("pipe-%s-%s", kmstest_pipe_name(pipe), igt_output_name(output)) { @@ -1502,7 +1502,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data) for_each_valid_output_on_pipe(&data.display, pipe, output) { drmModeModeInfo *mode = NULL; - if (get_num_scalers(data.drm_fd, pipe) < 1) + if (get_num_scalers(&data.display, pipe) < 1) continue; /* * Need to find mode with lowest vrefresh else @@ -1527,7 +1527,7 @@ igt_main_args("", long_opts, help_str, opt_handler, &data) for_each_pipe_with_valid_output(&data.display, pipe, output) { if (!pipe_output_combo_valid(&data.display, pipe, output)) continue; - if (get_num_scalers(data.drm_fd, pipe) < 1) + if (get_num_scalers(&data.display, pipe) < 1) continue; igt_dynamic_f("pipe-%s-%s-invalid-num-scalers", -- 2.46.0