drm/dp_mst: Use kHz as link rate units when settig source max link caps at init

[why]
Link rate in kHz is what is eventually required to calculate the link
bandwidth, which makes kHz a more generic unit. This should also make
forward-compatibility with new DP standards easier.

[how]
- Replace 'link rate DPCD code' with 'link rate in kHz' when used with
drm_dp_mst_topology_mgr_init()
- Add/remove related DPCD code conversion from/to kHz where applicable

Signed-off-by: Nikola Cornij <nikola.cornij@amd.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Lyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210512210011.8425-2-nikola.cornij@amd.com

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index e6b2eec9fb59ac5cdbc0b5392404ad17b73399bd..fed9496bdb36d88a2ddf1e1304388dc5efa826dd 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -461,8 +461,8 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,
                &aconnector->dm_dp_aux.aux,
                16,
                4,
-               (u8)max_link_enc_cap.lane_count,
-               (u8)max_link_enc_cap.link_rate,
+               max_link_enc_cap.lane_count,
+               drm_dp_bw_code_to_link_rate(max_link_enc_cap.link_rate),
                aconnector->connector_id);
 
        drm_connector_attach_dp_subconnector_property(&aconnector->base);

diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index 54604633e65c6a3f1aea34df51f129edb1b5b0dc..32b7f8983b94dc60d979c4910f31046a775ead22 100644 (file)
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -3722,9 +3722,9 @@ int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool ms
                }
 
                lane_count = min_t(int, mgr->dpcd[2] & DP_MAX_LANE_COUNT_MASK, mgr->max_lane_count);
-               link_rate = min_t(int, mgr->dpcd[1], mgr->max_link_rate);
+               link_rate = min_t(int, drm_dp_bw_code_to_link_rate(mgr->dpcd[1]), mgr->max_link_rate);
                mgr->pbn_div = drm_dp_get_vc_payload_bw(mgr,
-                                                       drm_dp_bw_code_to_link_rate(link_rate),
+                                                       link_rate,
                                                        lane_count);
                if (mgr->pbn_div == 0) {
                        ret = -EINVAL;
@@ -5454,7 +5454,7 @@ EXPORT_SYMBOL(drm_atomic_get_mst_topology_state);
  * @max_dpcd_transaction_bytes: hw specific DPCD transaction limit
  * @max_payloads: maximum number of payloads this GPU can source
  * @max_lane_count: maximum number of lanes this GPU supports
- * @max_link_rate: maximum link rate this GPU supports, units as in DPCD
+ * @max_link_rate: maximum link rate per lane this GPU supports in kHz
  * @conn_base_id: the connector object ID the MST device is connected to.
  *
  * Return 0 for success, or negative error code on failure
@@ -5462,7 +5462,7 @@ EXPORT_SYMBOL(drm_atomic_get_mst_topology_state);
 int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,
                                 struct drm_device *dev, struct drm_dp_aux *aux,
                                 int max_dpcd_transaction_bytes, int max_payloads,
-                                u8 max_lane_count, u8 max_link_rate,
+                                int max_lane_count, int max_link_rate,
                                 int conn_base_id)
 {
        struct drm_dp_mst_topology_state *mst_state;

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 332d2f9fda5c170435205dabe5dd748527de8b0a..b170e272bdeeafeb06238191e966307143f014fc 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -963,8 +963,8 @@ intel_dp_mst_encoder_init(struct intel_digital_port *dig_port, int conn_base_id)
        intel_dp_create_fake_mst_encoders(dig_port);
        ret = drm_dp_mst_topology_mgr_init(&intel_dp->mst_mgr, &i915->drm,
                                           &intel_dp->aux, 16, 3,
-                                          (u8)dig_port->max_lanes,
-                                          drm_dp_link_rate_to_bw_code(max_source_rate),
+                                          dig_port->max_lanes,
+                                          max_source_rate,
                                           conn_base_id);
        if (ret)
                return ret;

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index c46d0374b6e696a7ed8e11187ac9fda4da4ffda7..f949767698fc8ee9a3d6ede4873f04088fd88d0d 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -1617,8 +1617,9 @@ nv50_mstm_new(struct nouveau_encoder *outp, struct drm_dp_aux *aux, int aux_max,
        mstm->mgr.cbs = &nv50_mstm;
 
        ret = drm_dp_mst_topology_mgr_init(&mstm->mgr, dev, aux, aux_max,
-                                          (u8)max_payloads, outp->dcb->dpconf.link_nr,
-                                          (u8)outp->dcb->dpconf.link_bw, conn_base_id);
+                                          max_payloads, outp->dcb->dpconf.link_nr,
+                                          drm_dp_bw_code_to_link_rate(outp->dcb->dpconf.link_bw),
+                                          conn_base_id);
        if (ret)
                return ret;
 

diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c
index 13072c2a6502a937eab03461d443ac335bc74aba..ec867fa880a4f1a573347deae2842b96d48d5437 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_dp_mst.c
+++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c
@@ -642,7 +642,7 @@ radeon_dp_mst_init(struct radeon_connector *radeon_connector)
        radeon_connector->mst_mgr.cbs = &mst_cbs;
        return drm_dp_mst_topology_mgr_init(&radeon_connector->mst_mgr, dev,
                                            &radeon_connector->ddc_bus->aux, 16, 6,
-                                           4, (u8)max_link_rate,
+                                           4, drm_dp_bw_code_to_link_rate(max_link_rate),
                                            radeon_connector->base.base.id);
 }
 

diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h
index c87a829b64989668e08ec2b303cfe712ade13a89..ddb9231d030971066a8b7fa53863e78807bc23e2 100644 (file)
--- a/include/drm/drm_dp_mst_helper.h
+++ b/include/drm/drm_dp_mst_helper.h
@@ -596,11 +596,11 @@ struct drm_dp_mst_topology_mgr {
        /**
         * @max_lane_count: maximum number of lanes the GPU can drive.
         */
-       u8 max_lane_count;
+       int max_lane_count;
        /**
-        * @max_link_rate: maximum link rate per lane GPU can output.
+        * @max_link_rate: maximum link rate per lane GPU can output, in kHz.
         */
-       u8 max_link_rate;
+       int max_link_rate;
        /**
         * @conn_base_id: DRM connector ID this mgr is connected to. Only used
         * to build the MST connector path value.
@@ -774,7 +774,7 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,
                                 struct drm_device *dev, struct drm_dp_aux *aux,
                                 int max_dpcd_transaction_bytes,
                                 int max_payloads,
-                                u8 max_lane_count, u8 max_link_rate,
+                                int max_lane_count, int max_link_rate,
                                 int conn_base_id);
 
 void drm_dp_mst_topology_mgr_destroy(struct drm_dp_mst_topology_mgr *mgr);