Enable ALPM debug info through lobf debug info. As LOBF debugfs entries are now created for both DP and eDP connectors, rename i915_edp_lobf_debug/i915_edp_lobf_info to i915_lobf_debug/ i915_lobf_info. The connector type is already part of the debugfs path.
v2: cosmetic change. [Suraj] v3: Use common api instead of DISPLAY_VER check in multiple places. [Jani] v4: Add display-version check as it dropped for EDP. v5: - Rename debugfs entries to i915_lobf_debug/i915_lobf_info. [Jouni] - Rebase on intel_alpm_source_supported() taking intel_dp and skip MST connectors as they have no fixed encoder. Cc: Jouni Högander <[email protected]> Reviewed-by: Suraj Kandpal <[email protected]> Signed-off-by: Animesh Manna <[email protected]> --- drivers/gpu/drm/i915/display/intel_alpm.c | 31 ++++++++++++++--------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_alpm.c b/drivers/gpu/drm/i915/display/intel_alpm.c index b6307862b756..12dc79198494 100644 --- a/drivers/gpu/drm/i915/display/intel_alpm.c +++ b/drivers/gpu/drm/i915/display/intel_alpm.c @@ -680,7 +680,7 @@ void intel_alpm_lobf_enable(const struct intel_crtc_state *new_crtc_state) } } -static int i915_edp_lobf_info_show(struct seq_file *m, void *data) +static int i915_lobf_info_show(struct seq_file *m, void *data) { struct intel_connector *connector = m->private; struct intel_display *display = to_intel_display(connector); @@ -714,10 +714,10 @@ static int i915_edp_lobf_info_show(struct seq_file *m, void *data) return ret; } -DEFINE_SHOW_ATTRIBUTE(i915_edp_lobf_info); +DEFINE_SHOW_ATTRIBUTE(i915_lobf_info); static int -i915_edp_lobf_debug_get(void *data, u64 *val) +i915_lobf_debug_get(void *data, u64 *val) { struct intel_connector *connector = data; struct intel_dp *intel_dp = enc_to_intel_dp(connector->encoder); @@ -728,7 +728,7 @@ i915_edp_lobf_debug_get(void *data, u64 *val) } static int -i915_edp_lobf_debug_set(void *data, u64 val) +i915_lobf_debug_set(void *data, u64 val) { struct intel_connector *connector = data; struct intel_dp *intel_dp = enc_to_intel_dp(connector->encoder); @@ -738,8 +738,8 @@ i915_edp_lobf_debug_set(void *data, u64 val) return 0; } -DEFINE_SIMPLE_ATTRIBUTE(i915_edp_lobf_debug_fops, - i915_edp_lobf_debug_get, i915_edp_lobf_debug_set, +DEFINE_SIMPLE_ATTRIBUTE(i915_lobf_debug_fops, + i915_lobf_debug_get, i915_lobf_debug_set, "%llu\n"); void intel_alpm_lobf_debugfs_add(struct intel_connector *connector) @@ -747,15 +747,22 @@ void intel_alpm_lobf_debugfs_add(struct intel_connector *connector) struct intel_display *display = to_intel_display(connector); struct dentry *root = connector->base.debugfs_entry; - if (DISPLAY_VER(display) < 20 || - connector->base.connector_type != DRM_MODE_CONNECTOR_eDP) + if (DISPLAY_VER(display) < 20) + return; + + if (connector->base.connector_type != DRM_MODE_CONNECTOR_eDP && + connector->base.connector_type != DRM_MODE_CONNECTOR_DisplayPort) + return; + + if (connector->mst.dp || + !intel_alpm_source_supported(intel_attached_dp(connector))) return; - debugfs_create_file("i915_edp_lobf_debug", 0644, root, - connector, &i915_edp_lobf_debug_fops); + debugfs_create_file("i915_lobf_debug", 0644, root, + connector, &i915_lobf_debug_fops); - debugfs_create_file("i915_edp_lobf_info", 0444, root, - connector, &i915_edp_lobf_info_fops); + debugfs_create_file("i915_lobf_info", 0444, root, + connector, &i915_lobf_info_fops); } void intel_alpm_disable(struct intel_dp *intel_dp) -- 2.43.0
