| Message ID | 20240923181336.3303940-3-ankit.k.nautiyal@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Ultrajoiner basic functionality series | expand |
On Mon, Sep 23, 2024 at 11:43:22PM +0530, Ankit Nautiyal wrote: > Currently we support joiner only for DP encoder. > Do not create the debugfs for joiner if DP does not support the joiner. > This will also help avoiding cases where config has eDP MSO, with which > we do not support joiner. > > v2: Check for intel_dp_has_joiner and avoid creating debugfs if not > supported. (Ville) > v3 : Remove HAS_BIGJOINER check. (Ville) > > Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> > --- > drivers/gpu/drm/i915/display/intel_display_debugfs.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > index 890ef7067b77..6ded0a22d401 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > @@ -1328,6 +1328,7 @@ void intel_connector_debugfs_add(struct intel_connector *connector) > struct drm_i915_private *i915 = to_i915(connector->base.dev); > struct dentry *root = connector->base.debugfs_entry; > int connector_type = connector->base.connector_type; > + struct intel_dp *intel_dp = intel_attached_dp(connector); > > /* The connector must have been registered beforehands. */ > if (!root) > @@ -1362,7 +1363,7 @@ void intel_connector_debugfs_add(struct intel_connector *connector) > connector, &i915_dsc_fractional_bpp_fops); > } > > - if (HAS_BIGJOINER(i915) && > + if (intel_dp_has_joiner(intel_dp) && > (connector_type == DRM_MODE_CONNECTOR_DisplayPort || > connector_type == DRM_MODE_CONNECTOR_eDP)) { I think you need to reverse the connector type vs. intel_dp_has_joiner() checks, otherwise we already assume it's DP when calling intel_dp_has_joiner(). > debugfs_create_bool("i915_bigjoiner_force_enable", 0644, root, > -- > 2.45.2
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c index 890ef7067b77..6ded0a22d401 100644 --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c @@ -1328,6 +1328,7 @@ void intel_connector_debugfs_add(struct intel_connector *connector) struct drm_i915_private *i915 = to_i915(connector->base.dev); struct dentry *root = connector->base.debugfs_entry; int connector_type = connector->base.connector_type; + struct intel_dp *intel_dp = intel_attached_dp(connector); /* The connector must have been registered beforehands. */ if (!root) @@ -1362,7 +1363,7 @@ void intel_connector_debugfs_add(struct intel_connector *connector) connector, &i915_dsc_fractional_bpp_fops); } - if (HAS_BIGJOINER(i915) && + if (intel_dp_has_joiner(intel_dp) && (connector_type == DRM_MODE_CONNECTOR_DisplayPort || connector_type == DRM_MODE_CONNECTOR_eDP)) { debugfs_create_bool("i915_bigjoiner_force_enable", 0644, root,
Currently we support joiner only for DP encoder. Do not create the debugfs for joiner if DP does not support the joiner. This will also help avoiding cases where config has eDP MSO, with which we do not support joiner. v2: Check for intel_dp_has_joiner and avoid creating debugfs if not supported. (Ville) v3 : Remove HAS_BIGJOINER check. (Ville) Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> --- drivers/gpu/drm/i915/display/intel_display_debugfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)