]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/i915/display_debugfs: Allow force joiner only if supported
authorAnkit Nautiyal <ankit.k.nautiyal@intel.com>
Thu, 26 Sep 2024 13:43:20 +0000 (19:13 +0530)
committerAnkit Nautiyal <ankit.k.nautiyal@intel.com>
Mon, 30 Sep 2024 14:06:21 +0000 (19:36 +0530)
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)
v4: Reverse checks for connector type and intel_dp_has_joiner(). (Ville)
v5: Drop the local variable intel_dp and use intel_attached_dp() directly.

Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240926134322.3728021-3-ankit.k.nautiyal@intel.com
drivers/gpu/drm/i915/display/intel_display_debugfs.c

index 890ef7067b77b6c9648c9141b6d25fc515d4b569..c38023b43682e0ec22b8ba4e5c0b240af867b5fa 100644 (file)
@@ -1362,9 +1362,9 @@ void intel_connector_debugfs_add(struct intel_connector *connector)
                                    connector, &i915_dsc_fractional_bpp_fops);
        }
 
-       if (HAS_BIGJOINER(i915) &&
-           (connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
-            connector_type == DRM_MODE_CONNECTOR_eDP)) {
+       if ((connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
+            connector_type == DRM_MODE_CONNECTOR_eDP) &&
+           intel_dp_has_joiner(intel_attached_dp(connector))) {
                debugfs_create_bool("i915_bigjoiner_force_enable", 0644, root,
                                    &connector->force_bigjoiner_enable);
        }