drm/i915/dp: Ensure max link params are always valid

commit cc99bc62ff6902688ee7bd3a7b25eefc620fbb6a upstream.

Atm until the DPCD for a connector is read the max link rate and lane
count params are invalid. If the connector is modeset, in
intel_dp_compute_config(), intel_dp_common_len_rate_limit(max_link_rate)
will return 0, leading to a intel_dp->common_rates[-1] access.

Fix the above by making sure the max link params are always valid.

The above access leads to an undefined behaviour by definition, though
not causing a user visible problem to my best knowledge, see the previous
patch why. Nevertheless it is an undefined behaviour and it triggers a
BUG() in CONFIG_UBSAN builds, hence CC:stable.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211018094154.1407705-4-imre.deak@intel.com
(cherry picked from commit 9ad87de4735620ffc555592e8c5f580478fa3ed0)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 25b9b9f82b83ab14e24a3e774d40fd0cea96d3c4..b4c7355f89b694d12fb2e67ee56c76246cf37f38 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -1773,6 +1773,12 @@ void intel_dp_set_link_params(struct intel_dp *intel_dp,
        intel_dp->lane_count = lane_count;
 }
 
+static void intel_dp_reset_max_link_params(struct intel_dp *intel_dp)
+{
+       intel_dp->max_link_lane_count = intel_dp_max_common_lane_count(intel_dp);
+       intel_dp->max_link_rate = intel_dp_max_common_rate(intel_dp);
+}
+
 /* Enable backlight PWM and backlight PP control. */
 void intel_edp_backlight_on(const struct intel_crtc_state *crtc_state,
                            const struct drm_connector_state *conn_state)
@@ -1932,8 +1938,7 @@ void intel_dp_sync_state(struct intel_encoder *encoder,
        if (intel_dp->dpcd[DP_DPCD_REV] == 0)
                intel_dp_get_dpcd(intel_dp);
 
-       intel_dp->max_link_lane_count = intel_dp_max_common_lane_count(intel_dp);
-       intel_dp->max_link_rate = intel_dp_max_common_rate(intel_dp);
+       intel_dp_reset_max_link_params(intel_dp);
 }
 
 bool intel_dp_initial_fastset_check(struct intel_encoder *encoder,
@@ -2506,6 +2511,7 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp)
                intel_dp_set_sink_rates(intel_dp);
 
        intel_dp_set_common_rates(intel_dp);
+       intel_dp_reset_max_link_params(intel_dp);
 
        /* Read the eDP DSC DPCD registers */
        if (DISPLAY_VER(dev_priv) >= 10)
@@ -4249,12 +4255,7 @@ intel_dp_detect(struct drm_connector *connector,
         * supports link training fallback params.
         */
        if (intel_dp->reset_link_params || intel_dp->is_mst) {
-               /* Initial max link lane count */
-               intel_dp->max_link_lane_count = intel_dp_max_common_lane_count(intel_dp);
-
-               /* Initial max link rate */
-               intel_dp->max_link_rate = intel_dp_max_common_rate(intel_dp);
-
+               intel_dp_reset_max_link_params(intel_dp);
                intel_dp->reset_link_params = false;
        }
 
@@ -5307,6 +5308,7 @@ intel_dp_init_connector(struct intel_digital_port *dig_port,
        intel_dp_set_source_rates(intel_dp);
        intel_dp_set_default_sink_rates(intel_dp);
        intel_dp_set_common_rates(intel_dp);
+       intel_dp_reset_max_link_params(intel_dp);
 
        intel_dp->reset_link_params = true;
        intel_dp->pps.pps_pipe = INVALID_PIPE;