drm/i915/wm: move watermark debugfs to intel_wm.c

Follow the new convention of placing debugfs with the code.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230215141910.433043-3-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 953cdff..25013f3 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -11,7 +11,6 @@
 #include "i915_debugfs.h"
 #include "i915_irq.h"
 #include "i915_reg.h"
-#include "i9xx_wm.h"
 #include "intel_de.h"
 #include "intel_display_debugfs.h"
 #include "intel_display_power.h"
@@ -30,7 +29,7 @@
 #include "intel_pm.h"
 #include "intel_psr.h"
 #include "intel_sprite.h"
-#include "skl_watermark.h"
+#include "intel_wm.h"
 
 static inline struct drm_i915_private *node_to_i915(struct drm_info_node *node)
 {
@@ -1283,217 +1282,6 @@ static int i915_displayport_test_type_show(struct seq_file *m, void *data)
 }
 DEFINE_SHOW_ATTRIBUTE(i915_displayport_test_type);
 
-static void wm_latency_show(struct seq_file *m, const u16 wm[8])
-{
-       struct drm_i915_private *dev_priv = m->private;
-       int level;
-
-       drm_modeset_lock_all(&dev_priv->drm);
-
-       for (level = 0; level < dev_priv->display.wm.num_levels; level++) {
-               unsigned int latency = wm[level];
-
-               /*
-                * - WM1+ latency values in 0.5us units
-                * - latencies are in us on gen9/vlv/chv
-                */
-               if (DISPLAY_VER(dev_priv) >= 9 ||
-                   IS_VALLEYVIEW(dev_priv) ||
-                   IS_CHERRYVIEW(dev_priv) ||
-                   IS_G4X(dev_priv))
-                       latency *= 10;
-               else if (level > 0)
-                       latency *= 5;
-
-               seq_printf(m, "WM%d %u (%u.%u usec)\n",
-                          level, wm[level], latency / 10, latency % 10);
-       }
-
-       drm_modeset_unlock_all(&dev_priv->drm);
-}
-
-static int pri_wm_latency_show(struct seq_file *m, void *data)
-{
-       struct drm_i915_private *dev_priv = m->private;
-       const u16 *latencies;
-
-       if (DISPLAY_VER(dev_priv) >= 9)
-               latencies = dev_priv->display.wm.skl_latency;
-       else
-               latencies = dev_priv->display.wm.pri_latency;
-
-       wm_latency_show(m, latencies);
-
-       return 0;
-}
-
-static int spr_wm_latency_show(struct seq_file *m, void *data)
-{
-       struct drm_i915_private *dev_priv = m->private;
-       const u16 *latencies;
-
-       if (DISPLAY_VER(dev_priv) >= 9)
-               latencies = dev_priv->display.wm.skl_latency;
-       else
-               latencies = dev_priv->display.wm.spr_latency;
-
-       wm_latency_show(m, latencies);
-
-       return 0;
-}
-
-static int cur_wm_latency_show(struct seq_file *m, void *data)
-{
-       struct drm_i915_private *dev_priv = m->private;
-       const u16 *latencies;
-
-       if (DISPLAY_VER(dev_priv) >= 9)
-               latencies = dev_priv->display.wm.skl_latency;
-       else
-               latencies = dev_priv->display.wm.cur_latency;
-
-       wm_latency_show(m, latencies);
-
-       return 0;
-}
-
-static int pri_wm_latency_open(struct inode *inode, struct file *file)
-{
-       struct drm_i915_private *dev_priv = inode->i_private;
-
-       if (DISPLAY_VER(dev_priv) < 5 && !IS_G4X(dev_priv))
-               return -ENODEV;
-
-       return single_open(file, pri_wm_latency_show, dev_priv);
-}
-
-static int spr_wm_latency_open(struct inode *inode, struct file *file)
-{
-       struct drm_i915_private *dev_priv = inode->i_private;
-
-       if (HAS_GMCH(dev_priv))
-               return -ENODEV;
-
-       return single_open(file, spr_wm_latency_show, dev_priv);
-}
-
-static int cur_wm_latency_open(struct inode *inode, struct file *file)
-{
-       struct drm_i915_private *dev_priv = inode->i_private;
-
-       if (HAS_GMCH(dev_priv))
-               return -ENODEV;
-
-       return single_open(file, cur_wm_latency_show, dev_priv);
-}
-
-static ssize_t wm_latency_write(struct file *file, const char __user *ubuf,
-                               size_t len, loff_t *offp, u16 wm[8])
-{
-       struct seq_file *m = file->private_data;
-       struct drm_i915_private *dev_priv = m->private;
-       u16 new[8] = { 0 };
-       int level;
-       int ret;
-       char tmp[32];
-
-       if (len >= sizeof(tmp))
-               return -EINVAL;
-
-       if (copy_from_user(tmp, ubuf, len))
-               return -EFAULT;
-
-       tmp[len] = '\0';
-
-       ret = sscanf(tmp, "%hu %hu %hu %hu %hu %hu %hu %hu",
-                    &new[0], &new[1], &new[2], &new[3],
-                    &new[4], &new[5], &new[6], &new[7]);
-       if (ret != dev_priv->display.wm.num_levels)
-               return -EINVAL;
-
-       drm_modeset_lock_all(&dev_priv->drm);
-
-       for (level = 0; level < dev_priv->display.wm.num_levels; level++)
-               wm[level] = new[level];
-
-       drm_modeset_unlock_all(&dev_priv->drm);
-
-       return len;
-}
-
-
-static ssize_t pri_wm_latency_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;
-       u16 *latencies;
-
-       if (DISPLAY_VER(dev_priv) >= 9)
-               latencies = dev_priv->display.wm.skl_latency;
-       else
-               latencies = dev_priv->display.wm.pri_latency;
-
-       return wm_latency_write(file, ubuf, len, offp, latencies);
-}
-
-static ssize_t spr_wm_latency_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;
-       u16 *latencies;
-
-       if (DISPLAY_VER(dev_priv) >= 9)
-               latencies = dev_priv->display.wm.skl_latency;
-       else
-               latencies = dev_priv->display.wm.spr_latency;
-
-       return wm_latency_write(file, ubuf, len, offp, latencies);
-}
-
-static ssize_t cur_wm_latency_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;
-       u16 *latencies;
-
-       if (DISPLAY_VER(dev_priv) >= 9)
-               latencies = dev_priv->display.wm.skl_latency;
-       else
-               latencies = dev_priv->display.wm.cur_latency;
-
-       return wm_latency_write(file, ubuf, len, offp, latencies);
-}
-
-static const struct file_operations i915_pri_wm_latency_fops = {
-       .owner = THIS_MODULE,
-       .open = pri_wm_latency_open,
-       .read = seq_read,
-       .llseek = seq_lseek,
-       .release = single_release,
-       .write = pri_wm_latency_write
-};
-
-static const struct file_operations i915_spr_wm_latency_fops = {
-       .owner = THIS_MODULE,
-       .open = spr_wm_latency_open,
-       .read = seq_read,
-       .llseek = seq_lseek,
-       .release = single_release,
-       .write = spr_wm_latency_write
-};
-
-static const struct file_operations i915_cur_wm_latency_fops = {
-       .owner = THIS_MODULE,
-       .open = cur_wm_latency_open,
-       .read = seq_read,
-       .llseek = seq_lseek,
-       .release = single_release,
-       .write = cur_wm_latency_write
-};
-
 static ssize_t
 i915_fifo_underrun_reset_write(struct file *filp,
                               const char __user *ubuf,
@@ -1574,9 +1362,6 @@ static const struct {
        const struct file_operations *fops;
 } intel_display_debugfs_files[] = {
        {"i915_fifo_underrun_reset", &i915_fifo_underrun_reset_ops},
-       {"i915_pri_wm_latency", &i915_pri_wm_latency_fops},
-       {"i915_spr_wm_latency", &i915_spr_wm_latency_fops},
-       {"i915_cur_wm_latency", &i915_cur_wm_latency_fops},
        {"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},
@@ -1603,7 +1388,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_debugfs_register(i915);
+       intel_wm_debugfs_register(i915);
 }
 
 static int i915_panel_show(struct seq_file *m, void *data)

diff --git a/drivers/gpu/drm/i915/display/intel_wm.c b/drivers/gpu/drm/i915/display/intel_wm.c
index c4d14a5..bb99179 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_wm.c
+++ b/drivers/gpu/drm/i915/display/intel_wm.c
@@ -180,3 +180,229 @@ void intel_wm_init(struct drm_i915_private *i915)
        else
                i9xx_wm_init(i915);
 }
+
+static void wm_latency_show(struct seq_file *m, const u16 wm[8])
+{
+       struct drm_i915_private *dev_priv = m->private;
+       int level;
+
+       drm_modeset_lock_all(&dev_priv->drm);
+
+       for (level = 0; level < dev_priv->display.wm.num_levels; level++) {
+               unsigned int latency = wm[level];
+
+               /*
+                * - WM1+ latency values in 0.5us units
+                * - latencies are in us on gen9/vlv/chv
+                */
+               if (DISPLAY_VER(dev_priv) >= 9 ||
+                   IS_VALLEYVIEW(dev_priv) ||
+                   IS_CHERRYVIEW(dev_priv) ||
+                   IS_G4X(dev_priv))
+                       latency *= 10;
+               else if (level > 0)
+                       latency *= 5;
+
+               seq_printf(m, "WM%d %u (%u.%u usec)\n",
+                          level, wm[level], latency / 10, latency % 10);
+       }
+
+       drm_modeset_unlock_all(&dev_priv->drm);
+}
+
+static int pri_wm_latency_show(struct seq_file *m, void *data)
+{
+       struct drm_i915_private *dev_priv = m->private;
+       const u16 *latencies;
+
+       if (DISPLAY_VER(dev_priv) >= 9)
+               latencies = dev_priv->display.wm.skl_latency;
+       else
+               latencies = dev_priv->display.wm.pri_latency;
+
+       wm_latency_show(m, latencies);
+
+       return 0;
+}
+
+static int spr_wm_latency_show(struct seq_file *m, void *data)
+{
+       struct drm_i915_private *dev_priv = m->private;
+       const u16 *latencies;
+
+       if (DISPLAY_VER(dev_priv) >= 9)
+               latencies = dev_priv->display.wm.skl_latency;
+       else
+               latencies = dev_priv->display.wm.spr_latency;
+
+       wm_latency_show(m, latencies);
+
+       return 0;
+}
+
+static int cur_wm_latency_show(struct seq_file *m, void *data)
+{
+       struct drm_i915_private *dev_priv = m->private;
+       const u16 *latencies;
+
+       if (DISPLAY_VER(dev_priv) >= 9)
+               latencies = dev_priv->display.wm.skl_latency;
+       else
+               latencies = dev_priv->display.wm.cur_latency;
+
+       wm_latency_show(m, latencies);
+
+       return 0;
+}
+
+static int pri_wm_latency_open(struct inode *inode, struct file *file)
+{
+       struct drm_i915_private *dev_priv = inode->i_private;
+
+       if (DISPLAY_VER(dev_priv) < 5 && !IS_G4X(dev_priv))
+               return -ENODEV;
+
+       return single_open(file, pri_wm_latency_show, dev_priv);
+}
+
+static int spr_wm_latency_open(struct inode *inode, struct file *file)
+{
+       struct drm_i915_private *dev_priv = inode->i_private;
+
+       if (HAS_GMCH(dev_priv))
+               return -ENODEV;
+
+       return single_open(file, spr_wm_latency_show, dev_priv);
+}
+
+static int cur_wm_latency_open(struct inode *inode, struct file *file)
+{
+       struct drm_i915_private *dev_priv = inode->i_private;
+
+       if (HAS_GMCH(dev_priv))
+               return -ENODEV;
+
+       return single_open(file, cur_wm_latency_show, dev_priv);
+}
+
+static ssize_t wm_latency_write(struct file *file, const char __user *ubuf,
+                               size_t len, loff_t *offp, u16 wm[8])
+{
+       struct seq_file *m = file->private_data;
+       struct drm_i915_private *dev_priv = m->private;
+       u16 new[8] = { 0 };
+       int level;
+       int ret;
+       char tmp[32];
+
+       if (len >= sizeof(tmp))
+               return -EINVAL;
+
+       if (copy_from_user(tmp, ubuf, len))
+               return -EFAULT;
+
+       tmp[len] = '\0';
+
+       ret = sscanf(tmp, "%hu %hu %hu %hu %hu %hu %hu %hu",
+                    &new[0], &new[1], &new[2], &new[3],
+                    &new[4], &new[5], &new[6], &new[7]);
+       if (ret != dev_priv->display.wm.num_levels)
+               return -EINVAL;
+
+       drm_modeset_lock_all(&dev_priv->drm);
+
+       for (level = 0; level < dev_priv->display.wm.num_levels; level++)
+               wm[level] = new[level];
+
+       drm_modeset_unlock_all(&dev_priv->drm);
+
+       return len;
+}
+
+static ssize_t pri_wm_latency_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;
+       u16 *latencies;
+
+       if (DISPLAY_VER(dev_priv) >= 9)
+               latencies = dev_priv->display.wm.skl_latency;
+       else
+               latencies = dev_priv->display.wm.pri_latency;
+
+       return wm_latency_write(file, ubuf, len, offp, latencies);
+}
+
+static ssize_t spr_wm_latency_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;
+       u16 *latencies;
+
+       if (DISPLAY_VER(dev_priv) >= 9)
+               latencies = dev_priv->display.wm.skl_latency;
+       else
+               latencies = dev_priv->display.wm.spr_latency;
+
+       return wm_latency_write(file, ubuf, len, offp, latencies);
+}
+
+static ssize_t cur_wm_latency_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;
+       u16 *latencies;
+
+       if (DISPLAY_VER(dev_priv) >= 9)
+               latencies = dev_priv->display.wm.skl_latency;
+       else
+               latencies = dev_priv->display.wm.cur_latency;
+
+       return wm_latency_write(file, ubuf, len, offp, latencies);
+}
+
+static const struct file_operations i915_pri_wm_latency_fops = {
+       .owner = THIS_MODULE,
+       .open = pri_wm_latency_open,
+       .read = seq_read,
+       .llseek = seq_lseek,
+       .release = single_release,
+       .write = pri_wm_latency_write
+};
+
+static const struct file_operations i915_spr_wm_latency_fops = {
+       .owner = THIS_MODULE,
+       .open = spr_wm_latency_open,
+       .read = seq_read,
+       .llseek = seq_lseek,
+       .release = single_release,
+       .write = spr_wm_latency_write
+};
+
+static const struct file_operations i915_cur_wm_latency_fops = {
+       .owner = THIS_MODULE,
+       .open = cur_wm_latency_open,
+       .read = seq_read,
+       .llseek = seq_lseek,
+       .release = single_release,
+       .write = cur_wm_latency_write
+};
+
+void intel_wm_debugfs_register(struct drm_i915_private *i915)
+{
+       struct drm_minor *minor = i915->drm.primary;
+
+       debugfs_create_file("i915_pri_wm_latency", 0644, minor->debugfs_root,
+                           i915, &i915_pri_wm_latency_fops);
+
+       debugfs_create_file("i915_spr_wm_latency", 0644, minor->debugfs_root,
+                           i915, &i915_spr_wm_latency_fops);
+
+       debugfs_create_file("i915_cur_wm_latency", 0644, minor->debugfs_root,
+                           i915, &i915_cur_wm_latency_fops);
+
+       skl_watermark_debugfs_register(i915);
+}

diff --git a/drivers/gpu/drm/i915/display/intel_wm.h b/drivers/gpu/drm/i915/display/intel_wm.h
index dc58296..48429ac 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_wm.h
+++ b/drivers/gpu/drm/i915/display/intel_wm.h
@@ -32,5 +32,6 @@ bool intel_wm_plane_visible(const struct intel_crtc_state *crtc_state,
 void intel_print_wm_latency(struct drm_i915_private *i915,
                            const char *name, const u16 wm[]);
 void intel_wm_init(struct drm_i915_private *i915);
+void intel_wm_debugfs_register(struct drm_i915_private *i915);
 
 #endif /* __INTEL_WM_H__ */