drm/amd/display: Rename configure_encoder to enc1_configure_encoder

Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c
index af0bcff0b01a2dffd3e2408950f12b2eaf65c3f3..771449f8984f87ab7d6b08f2305142f90ed59063 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c
@@ -440,7 +440,7 @@ static uint8_t get_frontend_source(
        }
 }
 
-void configure_encoder(
+void enc1_configure_encoder(
        struct dcn10_link_encoder *enc10,
        const struct dc_link_settings *link_settings)
 {
@@ -910,7 +910,7 @@ void dcn10_link_encoder_enable_dp_output(
         * but it's not passed to asic_control.
         * We need to set number of lanes manually.
         */
-       configure_encoder(enc10, link_settings);
+       enc1_configure_encoder(enc10, link_settings);
 
        cntl.action = TRANSMITTER_CONTROL_ENABLE;
        cntl.engine_id = enc->preferred_engine;
@@ -949,7 +949,7 @@ void dcn10_link_encoder_enable_dp_mst_output(
         * but it's not passed to asic_control.
         * We need to set number of lanes manually.
         */
-       configure_encoder(enc10, link_settings);
+       enc1_configure_encoder(enc10, link_settings);
 
        cntl.action = TRANSMITTER_CONTROL_ENABLE;
        cntl.engine_id = ENGINE_ID_UNKNOWN;

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.h b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.h
index 49ead12b25329f497e6acf2c43411e1a8548ff11..670b46e887ed73ed832013de8511ef372343f8bd 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.h
@@ -271,7 +271,7 @@ void dcn10_link_encoder_setup(
        struct link_encoder *enc,
        enum signal_type signal);
 
-void configure_encoder(
+void enc1_configure_encoder(
        struct dcn10_link_encoder *enc10,
        const struct dc_link_settings *link_settings);