drm/i915/dp: Use connector DSC DPCD in intel_dp_dsc_compute_params()

Use the connector's DSC DPCD capabilities in
intel_dp_dsc_compute_params().

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231006133727.1822579-14-imre.deak@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 744c73a5a796d115b2f4574387a0d1a17204edf8..324fdfb5513ee0d1f63eac271a73952aacaa2ede 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -1636,11 +1636,10 @@ static int intel_dp_get_slice_height(int vactive)
        return 2;
 }
 
-static int intel_dp_dsc_compute_params(struct intel_encoder *encoder,
+static int intel_dp_dsc_compute_params(const struct intel_connector *connector,
                                       struct intel_crtc_state *crtc_state)
 {
-       struct drm_i915_private *i915 = to_i915(encoder->base.dev);
-       struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
+       struct drm_i915_private *i915 = to_i915(connector->base.dev);
        struct drm_dsc_config *vdsc_cfg = &crtc_state->dsc.config;
        u8 line_buf_depth;
        int ret;
@@ -1661,17 +1660,17 @@ static int intel_dp_dsc_compute_params(struct intel_encoder *encoder,
                return ret;
 
        vdsc_cfg->dsc_version_major =
-               (intel_dp->dsc_dpcd[DP_DSC_REV - DP_DSC_SUPPORT] &
+               (connector->dp.dsc_dpcd[DP_DSC_REV - DP_DSC_SUPPORT] &
                 DP_DSC_MAJOR_MASK) >> DP_DSC_MAJOR_SHIFT;
        vdsc_cfg->dsc_version_minor =
                min(intel_dp_source_dsc_version_minor(i915),
-                   intel_dp_sink_dsc_version_minor(intel_dp->dsc_dpcd));
+                   intel_dp_sink_dsc_version_minor(connector->dp.dsc_dpcd));
        if (vdsc_cfg->convert_rgb)
                vdsc_cfg->convert_rgb =
-                       intel_dp->dsc_dpcd[DP_DSC_DEC_COLOR_FORMAT_CAP - DP_DSC_SUPPORT] &
+                       connector->dp.dsc_dpcd[DP_DSC_DEC_COLOR_FORMAT_CAP - DP_DSC_SUPPORT] &
                        DP_DSC_RGB;
 
-       line_buf_depth = drm_dp_dsc_sink_line_buf_depth(intel_dp->dsc_dpcd);
+       line_buf_depth = drm_dp_dsc_sink_line_buf_depth(connector->dp.dsc_dpcd);
        if (!line_buf_depth) {
                drm_dbg_kms(&i915->drm,
                            "DSC Sink Line Buffer Depth invalid\n");
@@ -1686,7 +1685,7 @@ static int intel_dp_dsc_compute_params(struct intel_encoder *encoder,
                        DSC_1_1_MAX_LINEBUF_DEPTH_BITS : line_buf_depth;
 
        vdsc_cfg->block_pred_enable =
-               intel_dp->dsc_dpcd[DP_DSC_BLK_PREDICTION_SUPPORT - DP_DSC_SUPPORT] &
+               connector->dp.dsc_dpcd[DP_DSC_BLK_PREDICTION_SUPPORT - DP_DSC_SUPPORT] &
                DP_DSC_BLK_PREDICTION_IS_SUPPORTED;
 
        return drm_dsc_compute_rc_parameters(vdsc_cfg);
@@ -2182,7 +2181,7 @@ int intel_dp_dsc_compute_config(struct intel_dp *intel_dp,
        if (pipe_config->bigjoiner_pipes || pipe_config->dsc.slice_count > 1)
                pipe_config->dsc.dsc_split = true;
 
-       ret = intel_dp_dsc_compute_params(&dig_port->base, pipe_config);
+       ret = intel_dp_dsc_compute_params(connector, pipe_config);
        if (ret < 0) {
                drm_dbg_kms(&dev_priv->drm,
                            "Cannot compute valid DSC parameters for Input Bpp = %d "