Adds and implements the 'write' function for the debugfs i915_dp_test_ctrl file. Also adds in the required parsing function to read in the data from the file once the user app has written its data to it. V2: - N/A V3: - Removed use of dp_connector_is_valid() - Replaced with DRM connector check to match other functions - Updated the dp_parse_test_ctl function to use the new enums instead of #defines Signed-off-by: Todd Previte <tprevite@xxxxxxxxx> --- drivers/gpu/drm/i915/i915_debugfs.c | 105 ++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 45c0fde..e180813 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -4073,6 +4073,46 @@ static int dp_parse_config(char *input_buffer, return status; } +static int dp_parse_test_ctl(char *input_buffer, + ssize_t buffer_size, + struct intel_dp *intel_dp) +{ + char *ctrl_lines[DP_CTRL_PARAM_COUNT]; + int line_count; + int test_data; + int active; + int response; + char *conn_name; /* Connector name in the file */ + char *dp_name; /* Connector name in the intel_dp struct */ + + if (!input_buffer) + return -EIO; + + line_count = dp_tokenize_config(input_buffer, ctrl_lines); + if (line_count != DP_CTRL_PARAM_COUNT) + return -EIO; + + conn_name = ctrl_lines[DP_CTRL_PARAM_CONNECTOR]; + dp_name = intel_dp->attached_connector->base.name; + + if (strncmp(conn_name, dp_name, strlen(dp_name)) == 0) { + kstrtol(ctrl_lines[DP_CTRL_PARAM_TEST_DATA], + 16, + (long *)&test_data); + kstrtol(ctrl_lines[DP_CTRL_PARAM_TEST_ACTIVE], + 16, + (long *)&active); + kstrtol(ctrl_lines[DP_CTRL_PARAM_TEST_RESPONSE], + 16, + (long *)&response); + } else { + DRM_DEBUG_DRIVER("Connector names don't match\n"); + return -EIO; + } + + return 0; +} + static int i915_displayport_config_ctl_show(struct seq_file *m, void *data) { struct drm_device *dev = m->private; @@ -4180,6 +4220,70 @@ static const struct file_operations i915_displayport_config_ctl_fops = { .write = i915_displayport_config_ctl_write }; +static ssize_t i915_displayport_test_ctl_write(struct file *file, + const char __user *ubuf, + size_t len, loff_t *offp) +{ + char *input_buffer; + int status = 0; + struct seq_file *m; + struct drm_device *dev; + struct drm_connector *connector; + struct list_head *connector_list; + struct intel_dp *intel_dp; + + m = file->private_data; + if (!m) { + status = -ENODEV; + return status; + } + dev = m->private; + + if (!dev) { + status = -ENODEV; + return status; + } + connector_list = &dev->mode_config.connector_list; + + if (len == 0) + return 0; + + input_buffer = kmalloc(len + 1, GFP_KERNEL); + if (!input_buffer) + return -ENOMEM; + + if (copy_from_user(input_buffer, ubuf, len)) { + status = -EFAULT; + goto out; + } + + input_buffer[len] = '\0'; + DRM_DEBUG_DRIVER("Copied %d bytes from user\n", (unsigned int)len); + + list_for_each_entry(connector, connector_list, head) { + + if (connector->connector_type != + DRM_MODE_CONNECTOR_DisplayPort) + continue; + + if (connector->connector_type == + DRM_MODE_CONNECTOR_DisplayPort && + connector->status == connector_status_connected) { + intel_dp = enc_to_intel_dp(connector->encoder); + status = dp_parse_test_ctl(input_buffer, len, intel_dp); + if (status < 0) + goto out; + } + } +out: + kfree(input_buffer); + if (status < 0) + return status; + + *offp += len; + return len; +} + static int i915_displayport_test_ctl_show(struct seq_file *m, void *data) { struct drm_device *dev = m->private; @@ -4232,6 +4336,7 @@ static int i915_displayport_test_ctl_open(struct inode *inode, static const struct file_operations i915_dp_test_ctl_fops = { .owner = THIS_MODULE, .open = i915_displayport_test_ctl_open, + .write = i915_displayport_test_ctl_write, .read = seq_read, .llseek = seq_lseek, .release = single_release, -- 1.9.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx