drm/i915: Handle MST in intel_dp_has_dsc()

Utilize intel_dp_has_dsc() for MST as well.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240517145356.26103-4-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index a1792da3b6c725aca7a76706c3844ddb26014139..4364af21d5d8b50f25b4617e91887132cd61a556 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -1171,13 +1171,16 @@ bool intel_dp_need_joiner(struct intel_dp *intel_dp,
               connector->force_bigjoiner_enable;
 }
 
-static bool intel_dp_has_dsc(const struct intel_connector *connector)
+bool intel_dp_has_dsc(const struct intel_connector *connector)
 {
        struct drm_i915_private *i915 = to_i915(connector->base.dev);
 
        if (!HAS_DSC(i915))
                return false;
 
+       if (connector->mst_port && !HAS_DSC_MST(i915))
+               return false;
+
        if (!drm_dp_sink_supports_dsc(connector->dp.dsc_dpcd))
                return false;
 

diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h
index 32da3bdba9f6a1f9f25ec047d7df2c50516003a2..212fe041018c027530ddd0ed53f71512f5f875e2 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.h
+++ b/drivers/gpu/drm/i915/display/intel_dp.h
@@ -87,6 +87,7 @@ bool intel_dp_has_hdmi_sink(struct intel_dp *intel_dp);
 bool intel_dp_is_edp(struct intel_dp *intel_dp);
 bool intel_dp_as_sdp_supported(struct intel_dp *intel_dp);
 bool intel_dp_is_uhbr(const struct intel_crtc_state *crtc_state);
+bool intel_dp_has_dsc(const struct intel_connector *connector);
 int intel_dp_link_symbol_size(int rate);
 int intel_dp_link_symbol_clock(int rate);
 bool intel_dp_is_port_edp(struct drm_i915_private *dev_priv, enum port port);

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index e92a10c1f34e12c3706c794b31e78e0dbae4f510..a9a07dcf3ab45b58628af1ac9fa4095c43f8a809 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -1459,8 +1459,7 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector,
                return 0;
        }
 
-       if (HAS_DSC_MST(dev_priv) &&
-           drm_dp_sink_supports_dsc(intel_connector->dp.dsc_dpcd)) {
+       if (intel_dp_has_dsc(intel_connector)) {
                /*
                 * TBD pass the connector BPC,
                 * for now U8_MAX so that max BPC on that platform would be picked