Skip to content

Commit 0396403

Browse files
committed
drm/i915/pps: move pps debugfs file to intel_pps.c
Continue with placing debugfs next to the implementation. Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240408094357.3085319-1-jani.nikula@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1 parent 2b8ad19 commit 0396403

3 files changed

Lines changed: 35 additions & 25 deletions

File tree

drivers/gpu/drm/i915/display/intel_display_debugfs.c

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "intel_hdmi.h"
3232
#include "intel_hotplug.h"
3333
#include "intel_panel.h"
34+
#include "intel_pps.h"
3435
#include "intel_psr.h"
3536
#include "intel_psr_regs.h"
3637
#include "intel_wm.h"
@@ -1095,27 +1096,6 @@ void intel_display_debugfs_register(struct drm_i915_private *i915)
10951096
intel_display_debugfs_params(i915);
10961097
}
10971098

1098-
static int i915_panel_show(struct seq_file *m, void *data)
1099-
{
1100-
struct intel_connector *connector = m->private;
1101-
struct intel_dp *intel_dp = intel_attached_dp(connector);
1102-
1103-
if (connector->base.status != connector_status_connected)
1104-
return -ENODEV;
1105-
1106-
seq_printf(m, "Panel power up delay: %d\n",
1107-
intel_dp->pps.panel_power_up_delay);
1108-
seq_printf(m, "Panel power down delay: %d\n",
1109-
intel_dp->pps.panel_power_down_delay);
1110-
seq_printf(m, "Backlight on delay: %d\n",
1111-
intel_dp->pps.backlight_on_delay);
1112-
seq_printf(m, "Backlight off delay: %d\n",
1113-
intel_dp->pps.backlight_off_delay);
1114-
1115-
return 0;
1116-
}
1117-
DEFINE_SHOW_ATTRIBUTE(i915_panel);
1118-
11191099
static int i915_hdcp_sink_capability_show(struct seq_file *m, void *data)
11201100
{
11211101
struct intel_connector *connector = m->private;
@@ -1560,12 +1540,9 @@ void intel_connector_debugfs_add(struct intel_connector *connector)
15601540
return;
15611541

15621542
intel_drrs_connector_debugfs_add(connector);
1543+
intel_pps_connector_debugfs_add(connector);
15631544
intel_psr_connector_debugfs_add(connector);
15641545

1565-
if (connector_type == DRM_MODE_CONNECTOR_eDP)
1566-
debugfs_create_file("i915_panel_timings", 0444, root,
1567-
connector, &i915_panel_fops);
1568-
15691546
if (connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
15701547
connector_type == DRM_MODE_CONNECTOR_HDMIA ||
15711548
connector_type == DRM_MODE_CONNECTOR_HDMIB) {

drivers/gpu/drm/i915/display/intel_pps.c

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,6 +1670,37 @@ void intel_pps_setup(struct drm_i915_private *i915)
16701670
i915->display.pps.mmio_base = PPS_BASE;
16711671
}
16721672

1673+
static int intel_pps_show(struct seq_file *m, void *data)
1674+
{
1675+
struct intel_connector *connector = m->private;
1676+
struct intel_dp *intel_dp = intel_attached_dp(connector);
1677+
1678+
if (connector->base.status != connector_status_connected)
1679+
return -ENODEV;
1680+
1681+
seq_printf(m, "Panel power up delay: %d\n",
1682+
intel_dp->pps.panel_power_up_delay);
1683+
seq_printf(m, "Panel power down delay: %d\n",
1684+
intel_dp->pps.panel_power_down_delay);
1685+
seq_printf(m, "Backlight on delay: %d\n",
1686+
intel_dp->pps.backlight_on_delay);
1687+
seq_printf(m, "Backlight off delay: %d\n",
1688+
intel_dp->pps.backlight_off_delay);
1689+
1690+
return 0;
1691+
}
1692+
DEFINE_SHOW_ATTRIBUTE(intel_pps);
1693+
1694+
void intel_pps_connector_debugfs_add(struct intel_connector *connector)
1695+
{
1696+
struct dentry *root = connector->base.debugfs_entry;
1697+
int connector_type = connector->base.connector_type;
1698+
1699+
if (connector_type == DRM_MODE_CONNECTOR_eDP)
1700+
debugfs_create_file("i915_panel_timings", 0444, root,
1701+
connector, &intel_pps_fops);
1702+
}
1703+
16731704
void assert_pps_unlocked(struct drm_i915_private *dev_priv, enum pipe pipe)
16741705
{
16751706
i915_reg_t pp_reg;

drivers/gpu/drm/i915/display/intel_pps.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ void vlv_pps_init(struct intel_encoder *encoder,
5151
void intel_pps_unlock_regs_wa(struct drm_i915_private *i915);
5252
void intel_pps_setup(struct drm_i915_private *i915);
5353

54+
void intel_pps_connector_debugfs_add(struct intel_connector *connector);
55+
5456
void assert_pps_unlocked(struct drm_i915_private *i915, enum pipe pipe);
5557

5658
#endif /* __INTEL_PPS_H__ */

0 commit comments

Comments
 (0)