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 9589210F92E0 for ; Tue, 31 Mar 2026 17:13:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4AE9A10ECBA; Tue, 31 Mar 2026 17:13:45 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.b="vXHAUMN0"; dkim-atps=neutral Received: from smtpout-04.galae.net (smtpout-04.galae.net [185.171.202.116]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9DDBA10EC48 for ; Tue, 31 Mar 2026 17:11:26 +0000 (UTC) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id 2574CC59955 for ; Tue, 31 Mar 2026 17:11:56 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 821886029D; Tue, 31 Mar 2026 17:11:25 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 907B0104504A1; Tue, 31 Mar 2026 19:11:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1774977085; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=bDqBksgZfMQ1zc9MvVTSkvv6+SLrJXFdAppuK5wfMig=; b=vXHAUMN0DOs98F1Zpf0OnAtuQuJnfxuAuZ7c8nw6zEYJtbMiJ+tyx4YG7Cj0v1sWOZeFCC AZhoc1Is7hMh2tKyzuu1hiPSyNOGIvMrddjcCAXNp03pbMBQp9q077bq0FfVyayZq1v9Xa Lb403oy/txVbYdgZnKYB+UsBUxf+LMJxBDEVEoLKPcw0/El/kIK+AItzzfaCrDGbXKNbeg XhfFyD0ELl3MduP4ag6piRdKQNYt1MLqF88plIFZybaZ/3EKKsR7fdZ8yf90y0zDKEOJWi b8k8b4abUCW7iuPptQnawV2S7qH6V0Df837P1jrVa3EHf/ir0SuOpouSgwdkCQ== From: Louis Chauvet Date: Tue, 31 Mar 2026 19:11:58 +0200 Subject: [PATCH i-g-t v10 41/49] lib/i915/dp: Use igt_output_name instead of private field MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260331-unigraf-integration-v10-41-12266c34cc1d@bootlin.com> References: <20260331-unigraf-integration-v10-0-12266c34cc1d@bootlin.com> In-Reply-To: <20260331-unigraf-integration-v10-0-12266c34cc1d@bootlin.com> To: igt-dev@lists.freedesktop.org Cc: thomas.petazzoni@bootlin.com, luca.ceresoli@bootlin.com, kory.maincent@bootlin.com, markyacoub@google.com, khaled.almahallawy@intel.com, Louis Chauvet X-Mailer: b4 0.16-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=6380; i=louis.chauvet@bootlin.com; h=from:subject:message-id; bh=JcFrRo1jhKbM/28Ln7YoAGDYGEaSCxcLo7cMYYYhKgA=; b=owEBiQJ2/ZANAwAIASCtLsZbECziAcsmYgBpzABBpoPEoKzsabRrzruKDvNJ8DzNrUTVMEGKy eF2Hvu29MqJAk8EAAEIADkWIQRPj7g/vng8MQxQWQQgrS7GWxAs4gUCacwAQRsUgAAAAAAEAA5t YW51MiwyLjUrMS4xMSwyLDIACgkQIK0uxlsQLOLYmhAAuSlnDi21sku4ALqytTcwXhFyeFCtiim K0fbLs5Eh9lgNPPFRn4VnvTj0ulqEPn/7fE+zjIO9+K/dwTD9NLgqUWAdaiMdlhU+JzW9BGiTJt FaCPRlpybE+PBPv63k4WHBd7Nh9FoZS+YuJRLAmHbvhjawlly4ihZgWTe0TkucmLN8l4iw6SSZr TQrt7BXvZDtU5+787cTC5vCdigrWti0J6fBMNdd/hk4aLfSHqrq90HMRMnEfS1vkdLu1xDDbAs3 IzuOKYB5BK2le81lI4oA4IDdY6amH3ll//CADmPFv5AQjvReT4Lc1/t4xRe+pSKxQ/NdAFYobKJ wUyuuYIGx1Jcd7ZzKDTIHHDZEJEKpwo9ZGZ0RRG0CvLsRVTxDmTJkWBETHPf5gHqUjFrgYsAMVr pMhyXxo8xFK6Hvkbx5WCJJW8No+6+5VZ41dstreSWG2uzQKMUWm8rWbMlZRYKyVcVQADAETgk/9 0qfe5tp0dd4+FhCPwwoA0mDkHEPV150Oq6CShOO7bAO6pyz+VvGNjTOCsP+LA09vy+Gnwy3Yv9M JqK5hilE2r4SDnDxOcd01q4WZohWlDVxIefT8IDLpaSaXH3ckwqRWGRBsPOt2Pci1DqpoX+jPYe zMKcVOSAHHZR3yeHbPrEYZ208wSudiKuUQ3H7/hhnan5ailoPEqg= X-Developer-Key: i=louis.chauvet@bootlin.com; a=openpgp; fpr=8B7104AE9A272D6693F527F2EC1883F55E0B40A5 X-Last-TLS-Session-Version: TLSv1.3 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" output->name is a private field, use the common helper igt_output_name instead of the field directly. Reviewed-by: Kory Maincent Signed-off-by: Louis Chauvet --- lib/i915/i915_dp.c | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/lib/i915/i915_dp.c b/lib/i915/i915_dp.c index c2cddb955d75..e54058580ff2 100644 --- a/lib/i915/i915_dp.c +++ b/lib/i915/i915_dp.c @@ -35,6 +35,7 @@ #include "i915_dp.h" #include "igt_core.h" +#include "igt_kms.h" /** * i915_dp_parse_marked_value: @@ -78,13 +79,13 @@ int i915_dp_get_current_link_rate(int drm_fd, igt_output_t *output) char buf[512]; int res, ret; - res = igt_debugfs_read_connector_file(drm_fd, output->name, + res = igt_debugfs_read_connector_file(drm_fd, igt_output_name(output), "i915_dp_force_link_rate", buf, sizeof(buf)); igt_assert_f(res == 0, "Unable to read %s/i915_dp_force_link_rate\n", - output->name); + igt_output_name(output)); res = i915_dp_parse_marked_value(buf, '*', &ret); - igt_assert_f(res == 0, "Output %s not enabled\n", output->name); + igt_assert_f(res == 0, "Output %s not enabled\n", igt_output_name(output)); return ret; } @@ -100,13 +101,13 @@ int i915_dp_get_current_lane_count(int drm_fd, igt_output_t *output) char buf[512]; int res, ret; - res = igt_debugfs_read_connector_file(drm_fd, output->name, + res = igt_debugfs_read_connector_file(drm_fd, igt_output_name(output), "i915_dp_force_lane_count", buf, sizeof(buf)); igt_assert_f(res == 0, "Unable to read %s/i915_dp_force_lane_count\n", - output->name); + igt_output_name(output)); res = i915_dp_parse_marked_value(buf, '*', &ret); - igt_assert_f(res == 0, "Output %s not enabled\n", output->name); + igt_assert_f(res == 0, "Output %s not enabled\n", igt_output_name(output)); return ret; } @@ -122,11 +123,11 @@ int i915_dp_get_max_link_rate(int drm_fd, igt_output_t *output) char buf[512]; int res, ret; - res = igt_debugfs_read_connector_file(drm_fd, output->name, + res = igt_debugfs_read_connector_file(drm_fd, igt_output_name(output), "i915_dp_max_link_rate", buf, sizeof(buf)); igt_assert_f(res == 0, "Unable to read %s/i915_dp_max_link_rate\n", - output->name); + igt_output_name(output)); igt_assert_f(sscanf(buf, "%d", &ret) == 1, "Failed to parse max link rate from %s\n", buf); @@ -146,11 +147,11 @@ int i915_dp_get_max_lane_count(int drm_fd, igt_output_t *output) char buf[512]; int res, ret; - res = igt_debugfs_read_connector_file(drm_fd, output->name, + res = igt_debugfs_read_connector_file(drm_fd, igt_output_name(output), "i915_dp_max_lane_count", buf, sizeof(buf)); igt_assert_f(res == 0, "Unable to read %s/i915_dp_max_lane_count\n", - output->name); + igt_output_name(output)); igt_assert_f(sscanf(buf, "%d", &ret) == 1, "Failed to parse max lane count from %s\n", buf); @@ -172,11 +173,11 @@ void i915_dp_force_link_retrain(int drm_fd, igt_output_t *output, int retrain_co int res; snprintf(value, sizeof(value), "%d", retrain_count); - res = igt_debugfs_write_connector_file(drm_fd, output->name, + res = igt_debugfs_write_connector_file(drm_fd, igt_output_name(output), "i915_dp_force_link_retrain", value, strlen(value)); igt_assert_f(res == 0, "Unable to write to %s/i915_dp_force_link_retrain\n", - output->name); + igt_output_name(output)); } /** @@ -196,11 +197,11 @@ void i915_dp_force_lt_failure(int drm_fd, igt_output_t *output, int failure_coun int res; snprintf(value, sizeof(value), "%d", failure_count); - res = igt_debugfs_write_connector_file(drm_fd, output->name, + res = igt_debugfs_write_connector_file(drm_fd, igt_output_name(output), "i915_dp_force_link_training_failure", value, strlen(value)); igt_assert_f(res == 0, "Unable to write to %s/i915_dp_force_link_training_failure\n", - output->name); + igt_output_name(output)); } /** @@ -215,11 +216,11 @@ bool i915_dp_get_link_retrain_disabled(int drm_fd, igt_output_t *output) char buf[512]; int res; - res = igt_debugfs_read_connector_file(drm_fd, output->name, + res = igt_debugfs_read_connector_file(drm_fd, igt_output_name(output), "i915_dp_link_retrain_disabled", buf, sizeof(buf)); igt_assert_f(res == 0, "Unable to read %s/i915_dp_link_retrain_disabled\n", - output->name); + igt_output_name(output)); return strstr(buf, "yes"); } @@ -238,7 +239,7 @@ bool i915_dp_has_force_link_training_failure_debugfs(int drmfd, igt_output_t *ou char buf[512]; int res; - res = igt_debugfs_read_connector_file(drmfd, output->name, + res = igt_debugfs_read_connector_file(drmfd, igt_output_name(output), "i915_dp_link_retrain_disabled", buf, sizeof(buf)); return res == 0; @@ -256,11 +257,11 @@ int i915_dp_get_pending_lt_failures(int drm_fd, igt_output_t *output) char buf[512]; int res, ret; - res = igt_debugfs_read_connector_file(drm_fd, output->name, + res = igt_debugfs_read_connector_file(drm_fd, igt_output_name(output), "i915_dp_force_link_training_failure", buf, sizeof(buf)); igt_assert_f(res == 0, "Unable to read %s/i915_dp_force_link_training_failure\n", - output->name); + igt_output_name(output)); igt_assert_f(sscanf(buf, "%d", &ret) == 1, "Failed to parse pending link training failures from %s\n", buf); @@ -280,11 +281,11 @@ int i915_dp_get_pending_retrain(int drm_fd, igt_output_t *output) char buf[512]; int res, ret; - res = igt_debugfs_read_connector_file(drm_fd, output->name, + res = igt_debugfs_read_connector_file(drm_fd, igt_output_name(output), "i915_dp_force_link_retrain", buf, sizeof(buf)); igt_assert_f(res == 0, "Unable to read %s/i915_dp_force_link_retrain\n", - output->name); + igt_output_name(output)); igt_assert_f(sscanf(buf, "%d", &ret) == 1, "Failed to parse pending link retrains from %s\n", buf); -- 2.52.0