On Fri, Oct 06, 2023 at 04:37:27PM +0300, Imre Deak wrote:
> The previous patches converted all users of the DSC DPCD caps to look
> these up from the connector, so remove the version stored in intel_dp.
>
> A follow-up patchset will read out the MST connector specific
> capabilities in intel_dp_add_mst_connector() ->
> intel_dp_mst_read_decompression_port_dsc_caps().
>
> Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx>
Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display_types.h | 2 --
> drivers/gpu/drm/i915/display/intel_dp.c | 14 --------------
> 2 files changed, 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
> index d6600079bcf74..65ea37fe8cff3 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -1725,10 +1725,8 @@ struct intel_dp {
> u8 psr_dpcd[EDP_PSR_RECEIVER_CAP_SIZE];
> u8 downstream_ports[DP_MAX_DOWNSTREAM_PORTS];
> u8 edp_dpcd[EDP_DISPLAY_CTL_CAP_SIZE];
> - u8 dsc_dpcd[DP_DSC_RECEIVER_CAP_SIZE];
> u8 lttpr_common_caps[DP_LTTPR_COMMON_CAP_SIZE];
> u8 lttpr_phy_caps[DP_MAX_LTTPR_COUNT][DP_LTTPR_PHY_CAP_SIZE];
> - u8 fec_capable;
> u8 pcon_dsc_dpcd[DP_PCON_DSC_ENCODER_CAP_SIZE];
> /* source rates */
> int num_source_rates;
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index f58940c1baf9c..9d504ce2b54a7 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -3514,15 +3514,6 @@ void intel_dp_get_dsc_sink_cap(u8 dpcd_rev, struct intel_dp *intel_dp,
> drm_dbg_kms(&i915->drm, "FEC CAPABILITY: %x\n",
> connector->dp.fec_capability);
> }
> -
> - /*
> - * TODO: remove the following intel_dp copies once all users
> - * are converted to look up DSC DPCD/FEC capability via the
> - * connector.
> - */
> - memcpy(intel_dp->dsc_dpcd, connector->dp.dsc_dpcd,
> - sizeof(intel_dp->dsc_dpcd));
> - intel_dp->fec_capable = connector->dp.fec_capability;
> }
>
> static void intel_edp_mso_mode_fixup(struct intel_connector *connector,
> @@ -5390,11 +5381,6 @@ intel_dp_detect(struct drm_connector *connector,
>
> if (status == connector_status_disconnected) {
> memset(&intel_dp->compliance, 0, sizeof(intel_dp->compliance));
> - /*
> - * TODO: Remove clearing the DPCD in intel_dp, once all
> - * user are converted to using the DPCD in connector.
> - */
> - memset(intel_dp->dsc_dpcd, 0, sizeof(intel_dp->dsc_dpcd));
> memset(intel_connector->dp.dsc_dpcd, 0, sizeof(intel_connector->dp.dsc_dpcd));
>
> if (intel_dp->is_mst) {
> --
> 2.39.2
>
