drm/i915/hotplug: move hotplug storm debugfs to intel_hotplug.c

The debugfs should be where the implementation details are.

v2: Rebase

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220916130634.3781122-1-jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 7c7253a..c5f47df 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -22,6 +22,7 @@
 #include "intel_fbdev.h"
 #include "intel_hdcp.h"
 #include "intel_hdmi.h"
+#include "intel_hotplug.h"
 #include "intel_panel.h"
 #include "intel_pm.h"
 #include "intel_psr.h"
@@ -1566,162 +1567,6 @@ static const struct file_operations i915_cur_wm_latency_fops = {
        .write = cur_wm_latency_write
 };
 
-static int i915_hpd_storm_ctl_show(struct seq_file *m, void *data)
-{
-       struct drm_i915_private *dev_priv = m->private;
-       struct intel_hotplug *hotplug = &dev_priv->display.hotplug;
-
-       /* Synchronize with everything first in case there's been an HPD
-        * storm, but we haven't finished handling it in the kernel yet
-        */
-       intel_synchronize_irq(dev_priv);
-       flush_work(&dev_priv->display.hotplug.dig_port_work);
-       flush_delayed_work(&dev_priv->display.hotplug.hotplug_work);
-
-       seq_printf(m, "Threshold: %d\n", hotplug->hpd_storm_threshold);
-       seq_printf(m, "Detected: %s\n",
-                  str_yes_no(delayed_work_pending(&hotplug->reenable_work)));
-
-       return 0;
-}
-
-static ssize_t i915_hpd_storm_ctl_write(struct file *file,
-                                       const char __user *ubuf, size_t len,
-                                       loff_t *offp)
-{
-       struct seq_file *m = file->private_data;
-       struct drm_i915_private *dev_priv = m->private;
-       struct intel_hotplug *hotplug = &dev_priv->display.hotplug;
-       unsigned int new_threshold;
-       int i;
-       char *newline;
-       char tmp[16];
-
-       if (len >= sizeof(tmp))
-               return -EINVAL;
-
-       if (copy_from_user(tmp, ubuf, len))
-               return -EFAULT;
-
-       tmp[len] = '\0';
-
-       /* Strip newline, if any */
-       newline = strchr(tmp, '\n');
-       if (newline)
-               *newline = '\0';
-
-       if (strcmp(tmp, "reset") == 0)
-               new_threshold = HPD_STORM_DEFAULT_THRESHOLD;
-       else if (kstrtouint(tmp, 10, &new_threshold) != 0)
-               return -EINVAL;
-
-       if (new_threshold > 0)
-               drm_dbg_kms(&dev_priv->drm,
-                           "Setting HPD storm detection threshold to %d\n",
-                           new_threshold);
-       else
-               drm_dbg_kms(&dev_priv->drm, "Disabling HPD storm detection\n");
-
-       spin_lock_irq(&dev_priv->irq_lock);
-       hotplug->hpd_storm_threshold = new_threshold;
-       /* Reset the HPD storm stats so we don't accidentally trigger a storm */
-       for_each_hpd_pin(i)
-               hotplug->stats[i].count = 0;
-       spin_unlock_irq(&dev_priv->irq_lock);
-
-       /* Re-enable hpd immediately if we were in an irq storm */
-       flush_delayed_work(&dev_priv->display.hotplug.reenable_work);
-
-       return len;
-}
-
-static int i915_hpd_storm_ctl_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, i915_hpd_storm_ctl_show, inode->i_private);
-}
-
-static const struct file_operations i915_hpd_storm_ctl_fops = {
-       .owner = THIS_MODULE,
-       .open = i915_hpd_storm_ctl_open,
-       .read = seq_read,
-       .llseek = seq_lseek,
-       .release = single_release,
-       .write = i915_hpd_storm_ctl_write
-};
-
-static int i915_hpd_short_storm_ctl_show(struct seq_file *m, void *data)
-{
-       struct drm_i915_private *dev_priv = m->private;
-
-       seq_printf(m, "Enabled: %s\n",
-                  str_yes_no(dev_priv->display.hotplug.hpd_short_storm_enabled));
-
-       return 0;
-}
-
-static int
-i915_hpd_short_storm_ctl_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, i915_hpd_short_storm_ctl_show,
-                          inode->i_private);
-}
-
-static ssize_t i915_hpd_short_storm_ctl_write(struct file *file,
-                                             const char __user *ubuf,
-                                             size_t len, loff_t *offp)
-{
-       struct seq_file *m = file->private_data;
-       struct drm_i915_private *dev_priv = m->private;
-       struct intel_hotplug *hotplug = &dev_priv->display.hotplug;
-       char *newline;
-       char tmp[16];
-       int i;
-       bool new_state;
-
-       if (len >= sizeof(tmp))
-               return -EINVAL;
-
-       if (copy_from_user(tmp, ubuf, len))
-               return -EFAULT;
-
-       tmp[len] = '\0';
-
-       /* Strip newline, if any */
-       newline = strchr(tmp, '\n');
-       if (newline)
-               *newline = '\0';
-
-       /* Reset to the "default" state for this system */
-       if (strcmp(tmp, "reset") == 0)
-               new_state = !HAS_DP_MST(dev_priv);
-       else if (kstrtobool(tmp, &new_state) != 0)
-               return -EINVAL;
-
-       drm_dbg_kms(&dev_priv->drm, "%sabling HPD short storm detection\n",
-                   new_state ? "En" : "Dis");
-
-       spin_lock_irq(&dev_priv->irq_lock);
-       hotplug->hpd_short_storm_enabled = new_state;
-       /* Reset the HPD storm stats so we don't accidentally trigger a storm */
-       for_each_hpd_pin(i)
-               hotplug->stats[i].count = 0;
-       spin_unlock_irq(&dev_priv->irq_lock);
-
-       /* Re-enable hpd immediately if we were in an irq storm */
-       flush_delayed_work(&dev_priv->display.hotplug.reenable_work);
-
-       return len;
-}
-
-static const struct file_operations i915_hpd_short_storm_ctl_fops = {
-       .owner = THIS_MODULE,
-       .open = i915_hpd_short_storm_ctl_open,
-       .read = seq_read,
-       .llseek = seq_lseek,
-       .release = single_release,
-       .write = i915_hpd_short_storm_ctl_write,
-};
-
 static int i915_drrs_ctl_set(void *data, u64 val)
 {
        struct drm_i915_private *dev_priv = data;
@@ -1857,8 +1702,6 @@ static const struct {
        {"i915_dp_test_data", &i915_displayport_test_data_fops},
        {"i915_dp_test_type", &i915_displayport_test_type_fops},
        {"i915_dp_test_active", &i915_displayport_test_active_fops},
-       {"i915_hpd_storm_ctl", &i915_hpd_storm_ctl_fops},
-       {"i915_hpd_short_storm_ctl", &i915_hpd_short_storm_ctl_fops},
        {"i915_drrs_ctl", &i915_drrs_ctl_fops},
        {"i915_edp_psr_debug", &i915_edp_psr_debug_fops},
 };
@@ -1882,6 +1725,7 @@ void intel_display_debugfs_register(struct drm_i915_private *i915)
 
        intel_dmc_debugfs_register(i915);
        intel_fbc_debugfs_register(i915);
+       intel_hpd_debugfs_register(i915);
        skl_watermark_ipc_debugfs_register(i915);
 }
 

diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c
index f7a2f48..4faae25 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hotplug.c
+++ b/drivers/gpu/drm/i915/display/intel_hotplug.c
@@ -767,3 +767,169 @@ void intel_hpd_enable(struct drm_i915_private *dev_priv, enum hpd_pin pin)
        dev_priv->display.hotplug.stats[pin].state = HPD_ENABLED;
        spin_unlock_irq(&dev_priv->irq_lock);
 }
+
+static int i915_hpd_storm_ctl_show(struct seq_file *m, void *data)
+{
+       struct drm_i915_private *dev_priv = m->private;
+       struct intel_hotplug *hotplug = &dev_priv->display.hotplug;
+
+       /* Synchronize with everything first in case there's been an HPD
+        * storm, but we haven't finished handling it in the kernel yet
+        */
+       intel_synchronize_irq(dev_priv);
+       flush_work(&dev_priv->display.hotplug.dig_port_work);
+       flush_delayed_work(&dev_priv->display.hotplug.hotplug_work);
+
+       seq_printf(m, "Threshold: %d\n", hotplug->hpd_storm_threshold);
+       seq_printf(m, "Detected: %s\n",
+                  str_yes_no(delayed_work_pending(&hotplug->reenable_work)));
+
+       return 0;
+}
+
+static ssize_t i915_hpd_storm_ctl_write(struct file *file,
+                                       const char __user *ubuf, size_t len,
+                                       loff_t *offp)
+{
+       struct seq_file *m = file->private_data;
+       struct drm_i915_private *dev_priv = m->private;
+       struct intel_hotplug *hotplug = &dev_priv->display.hotplug;
+       unsigned int new_threshold;
+       int i;
+       char *newline;
+       char tmp[16];
+
+       if (len >= sizeof(tmp))
+               return -EINVAL;
+
+       if (copy_from_user(tmp, ubuf, len))
+               return -EFAULT;
+
+       tmp[len] = '\0';
+
+       /* Strip newline, if any */
+       newline = strchr(tmp, '\n');
+       if (newline)
+               *newline = '\0';
+
+       if (strcmp(tmp, "reset") == 0)
+               new_threshold = HPD_STORM_DEFAULT_THRESHOLD;
+       else if (kstrtouint(tmp, 10, &new_threshold) != 0)
+               return -EINVAL;
+
+       if (new_threshold > 0)
+               drm_dbg_kms(&dev_priv->drm,
+                           "Setting HPD storm detection threshold to %d\n",
+                           new_threshold);
+       else
+               drm_dbg_kms(&dev_priv->drm, "Disabling HPD storm detection\n");
+
+       spin_lock_irq(&dev_priv->irq_lock);
+       hotplug->hpd_storm_threshold = new_threshold;
+       /* Reset the HPD storm stats so we don't accidentally trigger a storm */
+       for_each_hpd_pin(i)
+               hotplug->stats[i].count = 0;
+       spin_unlock_irq(&dev_priv->irq_lock);
+
+       /* Re-enable hpd immediately if we were in an irq storm */
+       flush_delayed_work(&dev_priv->display.hotplug.reenable_work);
+
+       return len;
+}
+
+static int i915_hpd_storm_ctl_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, i915_hpd_storm_ctl_show, inode->i_private);
+}
+
+static const struct file_operations i915_hpd_storm_ctl_fops = {
+       .owner = THIS_MODULE,
+       .open = i915_hpd_storm_ctl_open,
+       .read = seq_read,
+       .llseek = seq_lseek,
+       .release = single_release,
+       .write = i915_hpd_storm_ctl_write
+};
+
+static int i915_hpd_short_storm_ctl_show(struct seq_file *m, void *data)
+{
+       struct drm_i915_private *dev_priv = m->private;
+
+       seq_printf(m, "Enabled: %s\n",
+                  str_yes_no(dev_priv->display.hotplug.hpd_short_storm_enabled));
+
+       return 0;
+}
+
+static int
+i915_hpd_short_storm_ctl_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, i915_hpd_short_storm_ctl_show,
+                          inode->i_private);
+}
+
+static ssize_t i915_hpd_short_storm_ctl_write(struct file *file,
+                                             const char __user *ubuf,
+                                             size_t len, loff_t *offp)
+{
+       struct seq_file *m = file->private_data;
+       struct drm_i915_private *dev_priv = m->private;
+       struct intel_hotplug *hotplug = &dev_priv->display.hotplug;
+       char *newline;
+       char tmp[16];
+       int i;
+       bool new_state;
+
+       if (len >= sizeof(tmp))
+               return -EINVAL;
+
+       if (copy_from_user(tmp, ubuf, len))
+               return -EFAULT;
+
+       tmp[len] = '\0';
+
+       /* Strip newline, if any */
+       newline = strchr(tmp, '\n');
+       if (newline)
+               *newline = '\0';
+
+       /* Reset to the "default" state for this system */
+       if (strcmp(tmp, "reset") == 0)
+               new_state = !HAS_DP_MST(dev_priv);
+       else if (kstrtobool(tmp, &new_state) != 0)
+               return -EINVAL;
+
+       drm_dbg_kms(&dev_priv->drm, "%sabling HPD short storm detection\n",
+                   new_state ? "En" : "Dis");
+
+       spin_lock_irq(&dev_priv->irq_lock);
+       hotplug->hpd_short_storm_enabled = new_state;
+       /* Reset the HPD storm stats so we don't accidentally trigger a storm */
+       for_each_hpd_pin(i)
+               hotplug->stats[i].count = 0;
+       spin_unlock_irq(&dev_priv->irq_lock);
+
+       /* Re-enable hpd immediately if we were in an irq storm */
+       flush_delayed_work(&dev_priv->display.hotplug.reenable_work);
+
+       return len;
+}
+
+static const struct file_operations i915_hpd_short_storm_ctl_fops = {
+       .owner = THIS_MODULE,
+       .open = i915_hpd_short_storm_ctl_open,
+       .read = seq_read,
+       .llseek = seq_lseek,
+       .release = single_release,
+       .write = i915_hpd_short_storm_ctl_write,
+};
+
+void intel_hpd_debugfs_register(struct drm_i915_private *i915)
+{
+       struct drm_minor *minor = i915->drm.primary;
+
+       debugfs_create_file("i915_hpd_storm_ctl", 0644, minor->debugfs_root,
+                           i915, &i915_hpd_storm_ctl_fops);
+       debugfs_create_file("i915_hpd_short_storm_ctl", 0644, minor->debugfs_root,
+                           i915, &i915_hpd_short_storm_ctl_fops);
+}

diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.h b/drivers/gpu/drm/i915/display/intel_hotplug.h
index b87e95d..aa84e38 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hotplug.h
+++ b/drivers/gpu/drm/i915/display/intel_hotplug.h
@@ -28,5 +28,6 @@ enum hpd_pin intel_hpd_pin_default(struct drm_i915_private *dev_priv,
                                   enum port port);
 bool intel_hpd_disable(struct drm_i915_private *dev_priv, enum hpd_pin pin);
 void intel_hpd_enable(struct drm_i915_private *dev_priv, enum hpd_pin pin);
+void intel_hpd_debugfs_register(struct drm_i915_private *i915);
 
 #endif /* __INTEL_HOTPLUG_H__ */