drm/i915/dp: use the sink rates array for max sink rates

Looking at DPCD DP_MAX_LINK_RATE may be completely bogus for eDP 1.4
which is allowed to use link rate select method and have 0 in max link
rate. With this change, it makes sense to store the max rate as the
actual rate rather than as a bw code.

Cc: Manasi Navare <manasi.d.navare@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/3e8baadb406d59f414cab36fed9f0b35d207fde5.1491485983.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index b38cba7d5abc7e1bdd6fa495de7b4a43a995ea41..e4650f1625ccb28488c34867d7ba22cccba68a49 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -161,23 +161,9 @@ static void intel_dp_set_sink_rates(struct intel_dp *intel_dp)
        intel_dp->num_sink_rates = num_rates;
 }
 
-static int
-intel_dp_max_link_bw(struct intel_dp  *intel_dp)
+static int intel_dp_max_sink_rate(struct intel_dp *intel_dp)
 {
-       int max_link_bw = intel_dp->dpcd[DP_MAX_LINK_RATE];
-
-       switch (max_link_bw) {
-       case DP_LINK_BW_1_62:
-       case DP_LINK_BW_2_7:
-       case DP_LINK_BW_5_4:
-               break;
-       default:
-               WARN(1, "invalid max DP link bw val %x, using 1.62Gbps\n",
-                    max_link_bw);
-               max_link_bw = DP_LINK_BW_1_62;
-               break;
-       }
-       return max_link_bw;
+       return intel_dp->sink_rates[intel_dp->num_sink_rates - 1];
 }
 
 static u8 intel_dp_max_lane_count(struct intel_dp *intel_dp)
@@ -301,7 +287,7 @@ static int intel_dp_rate_index(const int *rates, int len, int rate)
 static int intel_dp_common_rates(struct intel_dp *intel_dp,
                                 int *common_rates)
 {
-       int max_rate = drm_dp_bw_code_to_link_rate(intel_dp->max_sink_link_bw);
+       int max_rate = intel_dp->max_sink_link_rate;
        int i, common_len;
 
        common_len = intersect_rates(intel_dp->source_rates,
@@ -339,10 +325,10 @@ int intel_dp_get_link_train_fallback_values(struct intel_dp *intel_dp,
                                                   common_rates,
                                                   link_rate);
        if (link_rate_index > 0) {
-               intel_dp->max_sink_link_bw = drm_dp_link_rate_to_bw_code(common_rates[link_rate_index - 1]);
+               intel_dp->max_sink_link_rate = common_rates[link_rate_index - 1];
                intel_dp->max_sink_lane_count = lane_count;
        } else if (lane_count > 1) {
-               intel_dp->max_sink_link_bw = intel_dp_max_link_bw(intel_dp);
+               intel_dp->max_sink_link_rate = intel_dp_max_sink_rate(intel_dp);
                intel_dp->max_sink_lane_count = lane_count >> 1;
        } else {
                DRM_ERROR("Link Training Unsuccessful\n");
@@ -4652,8 +4638,8 @@ intel_dp_long_pulse(struct intel_connector *intel_connector)
                /* Set the max lane count for sink */
                intel_dp->max_sink_lane_count = drm_dp_max_lane_count(intel_dp->dpcd);
 
-               /* Set the max link BW for sink */
-               intel_dp->max_sink_link_bw = intel_dp_max_link_bw(intel_dp);
+               /* Set the max link rate for sink */
+               intel_dp->max_sink_link_rate = intel_dp_max_sink_rate(intel_dp);
 
                intel_dp->reset_link_params = false;
        }

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 7bc0c25b3396727d8eb2cc4ea07157f61b0cd638..92e353dc61bfb6f252aca80040eb738079b6159e 100644 (file)
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -959,7 +959,7 @@ struct intel_dp {
        /* Max lane count for the sink as per DPCD registers */
        uint8_t max_sink_lane_count;
        /* Max link BW for the sink as per DPCD registers */
-       int max_sink_link_bw;
+       int max_sink_link_rate;
        /* sink or branch descriptor */
        struct intel_dp_desc desc;
        struct drm_dp_aux aux;