Skip to content

Commit ae8986e

Browse files
ideakjlahtine-intel
authored andcommitted
drm/i915/dp: Fix the PSR debugfs entries wrt. MST connectors
MST connectors don't have a static attached encoder, as their encoder can change depending on the pipe they use; so the encoder for an MST connector can't be retrieved using intel_dp_attached_encoder() (which may return NULL for MST). Most of the PSR debugfs entries depend on a static connector -> encoder mapping which is only true for eDP and SST DP connectors and not for MST. These debugfs entries were enabled for MST connectors as well recently to provide PR information for them, but handling MST connectors needs more changes. Fix this by not adding for now the PSR entries on MST connectors. To make things more uniform add the entries for SST connectors on all platforms, not just on platforms supporting DP2.0. v2: - Keep adding the entries for SST connectors. (Jouni) - Add a TODO: comment for MST support. Fixes: ef75c25 ("drm/i915/panelreplay: Debugfs support for panel replay") Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/9850 Cc: Animesh Manna <animesh.manna@intel.com> Cc: Jouni Högander <jouni.hogander@intel.com> Reviewed-by: Jouni Högander <jouni.hogander@intel.com> Signed-off-by: Imre Deak <imre.deak@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240103152609.2434100-1-imre.deak@intel.com (cherry picked from commit 9b0b61c) Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
1 parent a4a9779 commit ae8986e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3319,11 +3319,11 @@ void intel_psr_connector_debugfs_add(struct intel_connector *connector)
33193319
struct drm_i915_private *i915 = to_i915(connector->base.dev);
33203320
struct dentry *root = connector->base.debugfs_entry;
33213321

3322-
if (connector->base.connector_type != DRM_MODE_CONNECTOR_eDP) {
3323-
if (!(HAS_DP20(i915) &&
3324-
connector->base.connector_type == DRM_MODE_CONNECTOR_DisplayPort))
3325-
return;
3326-
}
3322+
/* TODO: Add support for MST connectors as well. */
3323+
if ((connector->base.connector_type != DRM_MODE_CONNECTOR_eDP &&
3324+
connector->base.connector_type != DRM_MODE_CONNECTOR_DisplayPort) ||
3325+
connector->mst_port)
3326+
return;
33273327

33283328
debugfs_create_file("i915_psr_sink_status", 0444, root,
33293329
connector, &i915_psr_sink_status_fops);

0 commit comments

Comments
 (0)