[PATCH i-g-t v7 36/48] lib/i915/dp: Move DP-related function for i915 to proper folder

Louis Chauvet
2026-02-23T12:09:30Z

Some functions, prefixed with igt_ are not generic but specific to the
i915 intel driver. To avoid confusion and allows the introduction of
generic helpers, move those to a dedicated file.

Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
---
lib/i915/i915_dp.c | 345 ++++++++++++++++++++++++++++++++
lib/i915/i915_dp.h | 22 ++
lib/igt_kms.c | 310 ----------------------------
lib/igt_kms.h | 13 --
lib/meson.build | 1 +
tests/intel/kms_dp_link_training.c | 1 +
tests/intel/kms_dp_linktrain_fallback.c | 1 +
7 files changed, 370 insertions(+), 323 deletions(-)

diff --git a/lib/i915/i915_dp.c b/lib/i915/i915_dp.c
new file mode 100644
index 000000000000..024fe3b00210
--- /dev/null
+++ b/lib/i915/i915_dp.c
@@ -0,0 +1,345 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright (c) 2020, The Linux Foundation. All rights reserved.
+ * Copyright © 2013 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ * Authors:
+ * Daniel Vetter <daniel.vetter@ffwll.ch>
+ * Damien Lespiau <damien.lespiau@intel.com>
+ */
+
+#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "i915_dp.h"
+#include "igt_core.h"
+
+/**
+ * igt_parse_marked_value:
+ * @buf: Buffer containing the content to parse
+ * @marked_char: The character marking the value to parse
+ * @result: Pointer to store the parsed value
+ *
+ * Finds the integer value in the buffer that is marked by the given character.
+ *
+ * Returns: 0 on success, -1 on failure
+ */
+static int igt_parse_marked_value(const char *buf, char marked_char, int *result)
+{
+ char *marked_ptr, *val_ptr;
+
+ /*
+ * Look for the marked character
+ */
+ marked_ptr = strchr(buf, marked_char);
+
+ if (marked_ptr) {
+ val_ptr = marked_ptr - 1;
+ while (val_ptr > buf && isdigit(*val_ptr))
+ val_ptr--;
+ val_ptr++;
+ if (sscanf(val_ptr, "%d", result) == 1)
+ return 0;
+ }
+ return -1;
+}
+
+ /**
+ * igt_get_current_link_rate:
+ * @drm_fd: A drm file descriptor
+ * @output: Target output
+ *
+ * Returns: link_rate if set for output else -1
+ */
+int igt_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,
+ "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);
+ res = igt_parse_marked_value(buf, '*', &ret);
+ igt_assert_f(res == 0, "Output %s not enabled\n", output->name);
+ return ret;
+}
+
+/**
+ * igt_get_current_lane_count:
+ * @drm_fd: A drm file descriptor
+ * @output: Target output
+ *
+ * Returns: lane_count if set for output else -1
+ */
+int igt_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,
+ "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);
+ res = igt_parse_marked_value(buf, '*', &ret);
+ igt_assert_f(res == 0, "Output %s not enabled\n", output->name);
+ return ret;
+}
+
+/**
+ * igt_get_max_link_rate:
+ * @drm_fd: A drm file descriptor
+ * @output: Target output
+ *
+ * Returns: max_link_rate
+ */
+int igt_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,
+ "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);
+
+ sscanf(buf, "%d", &ret);
+ return ret;
+}
+
+/**
+ * igt_get_max_link_rate:
+ * @drm_fd: A drm file descriptor
+ * @output: Target output
+ *
+ * Returns: max_link_rate
+ */
+int igt_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,
+ "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);
+
+ sscanf(buf, "%d", &ret);
+ return ret;
+}
+
+/**
+ * igt_force_link_retrain:
+ * @drm_fd: A drm file descriptor
+ * @output: Target output
+ * @retrain_count: number of retraining required
+ *
+ * Force link retrain on the output.
+ */
+void igt_force_link_retrain(int drm_fd, igt_output_t *output, int retrain_count)
+{
+ char value[2];
+ int res;
+
+ snprintf(value, sizeof(value), "%d", retrain_count);
+ res = igt_debugfs_write_connector_file(drm_fd, output->name,
+ "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_force_lt_failure:
+ * @drm_fd: A drm file descriptor
+ * @output: Target output
+ * @failure_count: 1 for same link param and
+ * 2 for reduced link params
+ *
+ * Force link training failure on the output.
+ * @failure_count: 1 for retraining with same link params
+ * 2 for retraining with reduced link params
+ */
+void igt_force_lt_failure(int drm_fd, igt_output_t *output, int failure_count)
+{
+ char value[2];
+ int res;
+
+ snprintf(value, sizeof(value), "%d", failure_count);
+ res = igt_debugfs_write_connector_file(drm_fd, output->name,
+ "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_get_dp_link_retrain_disabled:
+ * @drm_fd: A drm file descriptor
+ * @output: Target output
+ *
+ * Returns: True if link retrain disabled, false otherwise
+ */
+bool igt_get_dp_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,
+ "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);
+ return strstr(buf, "yes");
+}
+
+/**
+ * Checks if the force link training failure debugfs
+ * is available for a specific output.
+ *
+ * @drmfd: file descriptor of the DRM device.
+ * @output: output to check.
+ * Returns:
+ * true if the debugfs is available, false otherwise.
+ */
+bool igt_has_force_link_training_failure_debugfs(int drmfd, igt_output_t *output)
+{
+ char buf[512];
+ int res;
+
+ res = igt_debugfs_read_connector_file(drmfd, output->name,
+ "i915_dp_link_retrain_disabled",
+ buf, sizeof(buf));
+ return res == 0;
+}
+
+/**
+ * igt_get_dp_pending_lt_failures:
+ * @drm_fd: A drm file descriptor
+ * @output: Target output
+ *
+ * Returns: Number of pending link training failures.
+ */
+int igt_get_dp_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,
+ "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);
+ sscanf(buf, "%d", &ret);
+ return ret;
+}
+
+/**
+ * igt_dp_pending_retrain:
+ * @drm_fd: A drm file descriptor
+ * @output: Target output
+ *
+ * Returns: Number of pending link retrains.
+ */
+int igt_get_dp_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,
+ "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);
+ sscanf(buf, "%d", &ret);
+ return ret;
+}
+
+/**
+ * igt_reset_link_params:
+ * @drm_fd: A drm file descriptor
+ * @output: Target output
+ *
+ * Reset link rate and lane count to auto, also installs exit handler
+ * to set link rate and lane count to auto on exit
+ */
+void igt_reset_link_params(int drm_fd, igt_output_t *output)
+{
+ bool valid;
+ drmModeConnector *temp;
+
+ valid = true;
+ valid = valid && connector_attr_set_debugfs(drm_fd, output->config.connector,
+ "i915_dp_force_link_rate",
+ "auto", "auto", true);
+ valid = valid && connector_attr_set_debugfs(drm_fd, output->config.connector,
+ "i915_dp_force_lane_count",
+ "auto", "auto", true);
+ igt_assert_f(valid, "Unable to set attr or install exit handler\n");
+ dump_connector_attrs();
+ igt_install_exit_handler(reset_connectors_at_exit);
+
+ /*
+ * To allow callers to always use GetConnectorCurrent we need to force a
+ * redetection here.
+ */
+ temp = drmModeGetConnector(drm_fd, output->config.connector->connector_id);
+ drmModeFreeConnector(temp);
+}
+
+/**
+ * igt_set_link_params:
+ * @drm_fd: A drm file descriptor
+ * @output: Target output
+ *
+ * set link rate and lane count to given value, also installs exit handler
+ * to set link rate and lane count to auto on exit
+ */
+void igt_set_link_params(int drm_fd, igt_output_t *output,
+ char *link_rate, char *lane_count)
+{
+ bool valid;
+ drmModeConnector *temp;
+
+ valid = true;
+ valid = valid && connector_attr_set_debugfs(drm_fd, output->config.connector,
+ "i915_dp_force_link_rate",
+ link_rate, "auto", true);
+ valid = valid && connector_attr_set_debugfs(drm_fd, output->config.connector,
+ "i915_dp_force_lane_count",
+ lane_count, "auto", true);
+ igt_assert_f(valid, "Unable to set attr or install exit handler\n");
+ dump_connector_attrs();
+ igt_install_exit_handler(reset_connectors_at_exit);
+
+ /*
+ * To allow callers to always use GetConnectorCurrent we need to force a
+ * redetection here.
+ */
+ temp = drmModeGetConnector(drm_fd, output->config.connector->connector_id);
+ drmModeFreeConnector(temp);
+}
diff --git a/lib/i915/i915_dp.h b/lib/i915/i915_dp.h
new file mode 100644
index 000000000000..2bcc9e2cb031
--- /dev/null
+++ b/lib/i915/i915_dp.h
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: MIT */
+
+#ifndef _I915_DP_H_
+#define _I915_DP_H_
+
+#include "igt_kms.h"
+
+int igt_get_current_link_rate(int drm_fd, igt_output_t *output);
+int igt_get_current_lane_count(int drm_fd, igt_output_t *output);
+int igt_get_max_link_rate(int drm_fd, igt_output_t *output);
+int igt_get_max_lane_count(int drm_fd, igt_output_t *output);
+void igt_force_link_retrain(int drm_fd, igt_output_t *output, int retrain_count);
+void igt_force_lt_failure(int drm_fd, igt_output_t *output, int failure_count);
+bool igt_get_dp_link_retrain_disabled(int drm_fd, igt_output_t *output);
+bool igt_has_force_link_training_failure_debugfs(int drmfd, igt_output_t *output);
+int igt_get_dp_pending_lt_failures(int drm_fd, igt_output_t *output);
+int igt_get_dp_pending_retrain(int drm_fd, igt_output_t *output);
+void igt_reset_link_params(int drm_fd, igt_output_t *output);
+void igt_set_link_params(int drm_fd, igt_output_t *output,
+ char *link_rate, char *lane_count);
+
+#endif
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 8fa2d8f9001e..5eb94be49494 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -7411,316 +7411,6 @@ int get_num_scalers(igt_display_t *display, enum pipe pipe)
return num_scalers;
}

-/**
- * igt_parse_marked_value:
- * @buf: Buffer containing the content to parse
- * @marked_char: The character marking the value to parse
- * @result: Pointer to store the parsed value
- *
- * Finds the integer value in the buffer that is marked by the given character.
- *
- * Returns: 0 on success, -1 on failure
- */
-static int igt_parse_marked_value(const char *buf, char marked_char, int *result)
-{
- char *marked_ptr, *val_ptr;
-
- /*
- * Look for the marked character
- */
- marked_ptr = strchr(buf, marked_char);
-
- if (marked_ptr) {
- val_ptr = marked_ptr - 1;
- while (val_ptr > buf && isdigit(*val_ptr))
- val_ptr--;
- val_ptr++;
- if (sscanf(val_ptr, "%d", result) == 1)
- return 0;
- }
- return -1;
-}
-
-/**
- * igt_get_current_link_rate:
- * @drm_fd: A drm file descriptor
- * @output: Target output
- *
- * Returns: link_rate if set for output else -1
- */
-int igt_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,
- "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);
- res = igt_parse_marked_value(buf, '*', &ret);
- igt_assert_f(res == 0, "Output %s not enabled\n", output->name);
- return ret;
-}
-
-/**
- * igt_get_current_lane_count:
- * @drm_fd: A drm file descriptor
- * @output: Target output
- *
- * Returns: lane_count if set for output else -1
- */
-int igt_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,
- "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);
- res = igt_parse_marked_value(buf, '*', &ret);
- igt_assert_f(res == 0, "Output %s not enabled\n", output->name);
- return ret;
-}
-
-/**
- * igt_get_max_link_rate:
- * @drm_fd: A drm file descriptor
- * @output: Target output
- *
- * Returns: max_link_rate
- */
-int igt_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,
- "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);
-
- sscanf(buf, "%d", &ret);
- return ret;
-}
-
-/**
- * igt_get_max_link_rate:
- * @drm_fd: A drm file descriptor
- * @output: Target output
- *
- * Returns: max_link_rate
- */
-int igt_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,
- "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);
-
- sscanf(buf, "%d", &ret);
- return ret;
-}
-
-/**
- * igt_force_link_retrain:
- * @drm_fd: A drm file descriptor
- * @output: Target output
- * @retrain_count: number of retraining required
- *
- * Force link retrain on the output.
- */
-void igt_force_link_retrain(int drm_fd, igt_output_t *output, int retrain_count)
-{
- char value[2];
- int res;
-
- snprintf(value, sizeof(value), "%d", retrain_count);
- res = igt_debugfs_write_connector_file(drm_fd, output->name,
- "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_force_lt_failure:
- * @drm_fd: A drm file descriptor
- * @output: Target output
- * @failure_count: 1 for same link param and
- * 2 for reduced link params
- *
- * Force link training failure on the output.
- * @failure_count: 1 for retraining with same link params
- * 2 for retraining with reduced link params
- */
-void igt_force_lt_failure(int drm_fd, igt_output_t *output, int failure_count)
-{
- char value[2];
- int res;
-
- snprintf(value, sizeof(value), "%d", failure_count);
- res = igt_debugfs_write_connector_file(drm_fd, output->name,
- "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_get_dp_link_retrain_disabled:
- * @drm_fd: A drm file descriptor
- * @output: Target output
- *
- * Returns: True if link retrain disabled, false otherwise
- */
-bool igt_get_dp_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,
- "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);
- return strstr(buf, "yes");
-}
-
-/**
- * Checks if the force link training failure debugfs
- * is available for a specific output.
- *
- * @drmfd: file descriptor of the DRM device.
- * @output: output to check.
- * Returns:
- * true if the debugfs is available, false otherwise.
- */
-bool igt_has_force_link_training_failure_debugfs(int drmfd, igt_output_t *output)
-{
- char buf[512];
- int res;
-
- res = igt_debugfs_read_connector_file(drmfd, output->name,
- "i915_dp_link_retrain_disabled",
- buf, sizeof(buf));
- return res == 0;
-}
-
-/**
- * igt_get_dp_pending_lt_failures:
- * @drm_fd: A drm file descriptor
- * @output: Target output
- *
- * Returns: Number of pending link training failures.
- */
-int igt_get_dp_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,
- "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);
- sscanf(buf, "%d", &ret);
- return ret;
-}
-
-/**
- * igt_dp_pending_retrain:
- * @drm_fd: A drm file descriptor
- * @output: Target output
- *
- * Returns: Number of pending link retrains.
- */
-int igt_get_dp_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,
- "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);
- sscanf(buf, "%d", &ret);
- return ret;
-}
-
-/**
- * igt_reset_link_params:
- * @drm_fd: A drm file descriptor
- * @output: Target output
- *
- * Reset link rate and lane count to auto, also installs exit handler
- * to set link rate and lane count to auto on exit
- */
-void igt_reset_link_params(int drm_fd, igt_output_t *output)
-{
- bool valid;
- drmModeConnector *temp;
-
- valid = true;
- valid = valid && connector_attr_set_debugfs(drm_fd, output->config.connector,
- "i915_dp_force_link_rate",
- "auto", "auto", true);
- valid = valid && connector_attr_set_debugfs(drm_fd, output->config.connector,
- "i915_dp_force_lane_count",
- "auto", "auto", true);
- igt_assert_f(valid, "Unable to set attr or install exit handler\n");
- dump_connector_attrs();
- igt_install_exit_handler(reset_connectors_at_exit);
-
- /*
- * To allow callers to always use GetConnectorCurrent we need to force a
- * redetection here.
- */
- temp = drmModeGetConnector(drm_fd, output->config.connector->connector_id);
- drmModeFreeConnector(temp);
-}
-
-/**
- * igt_set_link_params:
- * @drm_fd: A drm file descriptor
- * @output: Target output
- *
- * set link rate and lane count to given value, also installs exit handler
- * to set link rate and lane count to auto on exit
- */
-void igt_set_link_params(int drm_fd, igt_output_t *output,
- char *link_rate, char *lane_count)
-{
- bool valid;
- drmModeConnector *temp;
-
- valid = true;
- valid = valid && connector_attr_set_debugfs(drm_fd, output->config.connector,
- "i915_dp_force_link_rate",
- link_rate, "auto", true);
- valid = valid && connector_attr_set_debugfs(drm_fd, output->config.connector,
- "i915_dp_force_lane_count",
- lane_count, "auto", true);
- igt_assert_f(valid, "Unable to set attr or install exit handler\n");
- dump_connector_attrs();
- igt_install_exit_handler(reset_connectors_at_exit);
-
- /*
- * To allow callers to always use GetConnectorCurrent we need to force a
- * redetection here.
- */
- temp = drmModeGetConnector(drm_fd, output->config.connector->connector_id);
- drmModeFreeConnector(temp);
-}
-
/**
* igt_backlight_read:
* @result: Pointer to store the result
diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index 2399ec3069f4..4b5f6fcc929b 100644
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -1302,19 +1302,6 @@ 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(igt_display_t *display, enum pipe pipe);
-int igt_get_current_lane_count(int drm_fd, igt_output_t *output);
-int igt_get_current_link_rate(int drm_fd, igt_output_t *output);
-int igt_get_max_link_rate(int drm_fd, igt_output_t *output);
-int igt_get_max_lane_count(int drm_fd, igt_output_t *output);
-void igt_force_link_retrain(int drm_fd, igt_output_t *output, int retrain_count);
-void igt_force_lt_failure(int drm_fd, igt_output_t *output, int failure_count);
-bool igt_get_dp_link_retrain_disabled(int drm_fd, igt_output_t *output);
-bool igt_has_force_link_training_failure_debugfs(int drmfd, igt_output_t *output);
-int igt_get_dp_pending_lt_failures(int drm_fd, igt_output_t *output);
-int igt_get_dp_pending_retrain(int drm_fd, igt_output_t *output);
-void igt_reset_link_params(int drm_fd, igt_output_t *output);
-void igt_set_link_params(int drm_fd, igt_output_t *output,
- char *link_rate, char *lane_count);
int igt_backlight_read(int *result, const char *fname, igt_backlight_context_t *context);
int igt_backlight_write(int value, const char *fname, igt_backlight_context_t *context);
uint32_t igt_get_connected_output_count(igt_display_t *display);
diff --git a/lib/meson.build b/lib/meson.build
index be62bfcc032d..e7f2d3a77799 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -16,6 +16,7 @@ lib_sources = [
'i915/intel_fbc.c',
'i915/intel_memory_region.c',
'i915/i915_crc.c',
+ 'i915/i915_dp.c',
'igt_collection.c',
'igt_color_encoding.c',
'igt_configfs.c',
diff --git a/tests/intel/kms_dp_link_training.c b/tests/intel/kms_dp_link_training.c
index d859db64b4ff..57d31934a7ac 100644
--- a/tests/intel/kms_dp_link_training.c
+++ b/tests/intel/kms_dp_link_training.c
@@ -21,6 +21,7 @@
* Description: Test we can drive non-UHBR rates over MST.
*/

+#include "i915/i915_dp.h"
#include "igt.h"
#include "igt_kms.h"
#include "intel/kms_joiner_helper.h"
diff --git a/tests/intel/kms_dp_linktrain_fallback.c b/tests/intel/kms_dp_linktrain_fallback.c
index ad34b1fabc23..8cdbe1725ea7 100644
--- a/tests/intel/kms_dp_linktrain_fallback.c
+++ b/tests/intel/kms_dp_linktrain_fallback.c
@@ -12,6 +12,7 @@
*/

#include <sys/types.h>
+#include "i915/i915_dp.h"
#include "igt_sysfs.h"
#include "igt.h"
#include "kms_mst_helper.h"

--
2.52.0