@@ -68,6 +68,15 @@ enum dp_config_param {
DP_CONFIG_PARAM_INVALID = -1
};
+enum dp_ctrl_param {
+ DP_CTRL_PARAM_CONNECTOR = 0,
+ DP_CTRL_PARAM_TEST_DATA,
+ DP_CTRL_PARAM_TEST_ACTIVE,
+ DP_CTRL_PARAM_TEST_RESPONSE,
+ DP_CTRL_PARAM_COUNT,
+ DP_CTRL_PARAM_INVALID = -1
+};
+
struct dp_config {
enum dp_config_param type;
unsigned long value;
@@ -4171,6 +4180,63 @@ static const struct file_operations i915_displayport_config_ctl_fops = {
.write = i915_displayport_config_ctl_write
};
+static int i915_displayport_test_ctl_show(struct seq_file *m, void *data)
+{
+ struct drm_device *dev = m->private;
+ struct drm_connector *connector;
+ struct list_head *connector_list = &dev->mode_config.connector_list;
+ struct intel_dp *intel_dp;
+
+ if (!dev)
+ return -ENODEV;
+
+ list_for_each_entry(connector, connector_list, head) {
+
+ if (connector->connector_type !=
+ DRM_MODE_CONNECTOR_DisplayPort)
+ continue;
+
+ if (connector->status == connector_status_connected) {
+ intel_dp = enc_to_intel_dp(connector->encoder);
+ /* Compliance test data informs userspace about current
+ request
+ */
+ seq_printf(m, "Test Data : %08lx\n",
+ intel_dp->compliance_test_data);
+ seq_printf(m, "Test Active: %02x\n",
+ intel_dp->compliance_testing_active);
+ seq_printf(m, "Test Response: %02lx\n",
+ intel_dp->compliance_test_response);
+ } else {
+ dp_print_string(m,
+ DP_CONFIG_PARAM_CONNECTOR,
+ connector->name);
+ dp_print_string(m,
+ DP_CONFIG_PARAM_CONNECTOR_ID,
+ &connector->base.id);
+ seq_puts(m, "disconnected\n");
+ }
+ }
+
+ return 0;
+}
+
+static int i915_displayport_test_ctl_open(struct inode *inode,
+ struct file *file)
+{
+ struct drm_device *dev = inode->i_private;
+
+ return single_open(file, i915_displayport_test_ctl_show, dev);
+}
+
+static const struct file_operations i915_dp_test_ctl_fops = {
+ .owner = THIS_MODULE,
+ .open = i915_displayport_test_ctl_open,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+
static void wm_latency_show(struct seq_file *m, const uint16_t wm[8])
{
struct drm_device *dev = m->private;
@@ -4920,7 +4986,8 @@ static const struct i915_debugfs_files {
{"i915_spr_wm_latency", &i915_spr_wm_latency_fops},
{"i915_cur_wm_latency", &i915_cur_wm_latency_fops},
{"i915_fbc_false_color", &i915_fbc_fc_fops},
- {"i915_displayport_config_ctl", &i915_displayport_config_ctl_fops}
+ {"i915_displayport_config_ctl", &i915_displayport_config_ctl_fops},
+ {"i915_dp_test_ctl", &i915_dp_test_ctl_fops}
};
void intel_display_crc_init(struct drm_device *dev)
@@ -663,6 +663,7 @@ struct intel_dp {
/* Displayport compliance testing */
unsigned long compliance_test_data;
bool compliance_testing_active;
+ unsigned long compliance_test_response;
struct intel_dp_link_config compliance_config;
};
Adds a new file for controlling Displayport compliance testing via the debugfs interface. Adds two functions, 'open' and 'show', as well as the file operations structure to support reading the file from userspace. The new file is called 'i915_dp_test_ctl' and contains 4 fields: - Connector name - Test data - Test active flag - Test response These four fields are used to control communication and operation between the userspace application and the kernel during compliance testing. A new variable is also added to the intel_dp struct to hold the response code from the user application. This response code is then sent to the sink device upon completion of the test. V2: - N/A V3: - Removed the reference to dp_connector_is_valid() - Updated the show() function to match config_ctl_show() - Updated the enums to match the format of the existing enums for the config parameters Signed-off-by: Todd Previte <tprevite@gmail.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 69 ++++++++++++++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_drv.h | 1 + 2 files changed, 69 insertions(+), 1 deletion(-)