drm/amd/display: Rename set_mst_bandwidth to align with DP spec

[Why]
The function set_mst_bandwidth is poorly name since it isn't clear what
it does, and it also does not reflect any part of the allocation sequence
described in the DP spec.

[How]
Rename the function set_mst_bandwidth to set_throttled_vcp_size.

Signed-off-by: George Shen <george.shen@amd.com>
Acked-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
index 437d1a7a16fe7aa2807a0d5c9439c3955c30bf7a..1871ff6119ae0de01ff74d43e73bd0fab41f09ba 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -2946,7 +2946,7 @@ enum dc_status dc_link_allocate_mst_payload(struct pipe_ctx *pipe_ctx)
        pbn = get_pbn_from_timing(pipe_ctx);
        avg_time_slots_per_mtp = dc_fixpt_div(pbn, pbn_per_slot);
 
-       stream_encoder->funcs->set_mst_bandwidth(
+       stream_encoder->funcs->set_throttled_vcp_size(
                stream_encoder,
                avg_time_slots_per_mtp);
 
@@ -2974,7 +2974,7 @@ static enum dc_status deallocate_mst_payload(struct pipe_ctx *pipe_ctx)
         */
 
        /* slot X.Y */
-       stream_encoder->funcs->set_mst_bandwidth(
+       stream_encoder->funcs->set_throttled_vcp_size(
                stream_encoder,
                avg_time_slots_per_mtp);
 

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
index 4cdaaf4d881cc42122d597ca71e3fbcb5068b8ac..5054bb567b748762c9c6bcfc75e0491c006ff5c2 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
@@ -710,7 +710,7 @@ static void dce110_stream_encoder_lvds_set_stream_attribute(
        ASSERT(crtc_timing->pixel_encoding == PIXEL_ENCODING_RGB);
 }
 
-static void dce110_stream_encoder_set_mst_bandwidth(
+static void dce110_stream_encoder_set_throttled_vcp_size(
        struct stream_encoder *enc,
        struct fixed31_32 avg_time_slots_per_mtp)
 {
@@ -1621,8 +1621,8 @@ static const struct stream_encoder_funcs dce110_str_enc_funcs = {
                dce110_stream_encoder_dvi_set_stream_attribute,
        .lvds_set_stream_attribute =
                dce110_stream_encoder_lvds_set_stream_attribute,
-       .set_mst_bandwidth =
-               dce110_stream_encoder_set_mst_bandwidth,
+       .set_throttled_vcp_size =
+               dce110_stream_encoder_set_throttled_vcp_size,
        .update_hdmi_info_packets =
                dce110_stream_encoder_update_hdmi_info_packets,
        .stop_hdmi_info_packets =

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c
index 842abb4c475bceddf05e48214bd6b611b3386efa..9cf139be3f40ed67ef3c7a8be82dce97aabdb671 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c
@@ -619,7 +619,7 @@ void enc1_stream_encoder_dvi_set_stream_attribute(
        enc1_stream_encoder_set_stream_attribute_helper(enc1, crtc_timing);
 }
 
-void enc1_stream_encoder_set_mst_bandwidth(
+void enc1_stream_encoder_set_throttled_vcp_size(
        struct stream_encoder *enc,
        struct fixed31_32 avg_time_slots_per_mtp)
 {
@@ -1616,8 +1616,8 @@ static const struct stream_encoder_funcs dcn10_str_enc_funcs = {
                enc1_stream_encoder_hdmi_set_stream_attribute,
        .dvi_set_stream_attribute =
                enc1_stream_encoder_dvi_set_stream_attribute,
-       .set_mst_bandwidth =
-               enc1_stream_encoder_set_mst_bandwidth,
+       .set_throttled_vcp_size =
+               enc1_stream_encoder_set_throttled_vcp_size,
        .update_hdmi_info_packets =
                enc1_stream_encoder_update_hdmi_info_packets,
        .stop_hdmi_info_packets =

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.h b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.h
index 30eae7459d5090ab2f6db5a938b872745bdeb4f1..b99d2527cf0362cefbacb5e9277ec4c0e9799620 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.h
@@ -588,7 +588,7 @@ void enc1_stream_encoder_dvi_set_stream_attribute(
        struct dc_crtc_timing *crtc_timing,
        bool is_dual_link);
 
-void enc1_stream_encoder_set_mst_bandwidth(
+void enc1_stream_encoder_set_throttled_vcp_size(
        struct stream_encoder *enc,
        struct fixed31_32 avg_time_slots_per_mtp);
 

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c
index e3984f02b7b3ed4429b529d3d2bc741e8dec1f88..4075ae111530462a44da2cb68f579eebebd832b2 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c
@@ -561,8 +561,8 @@ static const struct stream_encoder_funcs dcn20_str_enc_funcs = {
                enc1_stream_encoder_hdmi_set_stream_attribute,
        .dvi_set_stream_attribute =
                enc1_stream_encoder_dvi_set_stream_attribute,
-       .set_mst_bandwidth =
-               enc1_stream_encoder_set_mst_bandwidth,
+       .set_throttled_vcp_size =
+               enc1_stream_encoder_set_throttled_vcp_size,
        .update_hdmi_info_packets =
                enc2_stream_encoder_update_hdmi_info_packets,
        .stop_hdmi_info_packets =

diff --git a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.c
index f5e80a0db72b7720e35de7f14c411499792423b1..6c0f7ef0a3dfafc281ab39af98620b4d08d89ea1 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.c
@@ -790,8 +790,8 @@ static const struct stream_encoder_funcs dcn30_str_enc_funcs = {
                enc3_stream_encoder_hdmi_set_stream_attribute,
        .dvi_set_stream_attribute =
                enc3_stream_encoder_dvi_set_stream_attribute,
-       .set_mst_bandwidth =
-               enc1_stream_encoder_set_mst_bandwidth,
+       .set_throttled_vcp_size =
+               enc1_stream_encoder_set_throttled_vcp_size,
        .update_hdmi_info_packets =
                enc3_stream_encoder_update_hdmi_info_packets,
        .stop_hdmi_info_packets =

diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h b/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h
index 11ce06e69d3ff050f7877ec803572d8a6605a475..0184cefb083bf260d1625ea36672af58ad6280d8 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h
@@ -143,7 +143,7 @@ struct stream_encoder_funcs {
                struct stream_encoder *enc,
                struct dc_crtc_timing *crtc_timing);
 
-       void (*set_mst_bandwidth)(
+       void (*set_throttled_vcp_size)(
                struct stream_encoder *enc,
                struct fixed31_32 avg_time_slots_per_mtp);
 

diff --git a/drivers/gpu/drm/amd/display/dc/virtual/virtual_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/virtual/virtual_stream_encoder.c
index 944c0327763c1c940d6aee8e01c3c9cc1c113339..f0a0d419e555cc310b812c175a0defa4604fd851 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/virtual/virtual_stream_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/virtual/virtual_stream_encoder.c
@@ -46,9 +46,10 @@ static void virtual_stream_encoder_dvi_set_stream_attribute(
        struct dc_crtc_timing *crtc_timing,
        bool is_dual_link) {}
 
-static void virtual_stream_encoder_set_mst_bandwidth(
+static void virtual_stream_encoder_set_throttled_vcp_size(
        struct stream_encoder *enc,
-       struct fixed31_32 avg_time_slots_per_mtp) {}
+       struct fixed31_32 avg_time_slots_per_mtp)
+{}
 
 static void virtual_stream_encoder_update_hdmi_info_packets(
        struct stream_encoder *enc,
@@ -107,8 +108,8 @@ static const struct stream_encoder_funcs virtual_str_enc_funcs = {
                virtual_stream_encoder_hdmi_set_stream_attribute,
        .dvi_set_stream_attribute =
                virtual_stream_encoder_dvi_set_stream_attribute,
-       .set_mst_bandwidth =
-               virtual_stream_encoder_set_mst_bandwidth,
+       .set_throttled_vcp_size =
+               virtual_stream_encoder_set_throttled_vcp_size,
        .update_hdmi_info_packets =
                virtual_stream_encoder_update_hdmi_info_packets,
        .stop_hdmi_info_packets =