drm/amd/display: remove audio mute control in hpo dp

VPG doesn't have the ability to mute audio output by sending all 0s in
audio SDP. The existing implemention is disabling audio SDP instead.
This is same as what dp_audio_enable does. Since it is no longer
referenced by any callers, we decided to remove this interface for
simplicity.

Tested-by: Mark Broadworth <mark.broadworth@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Wenjing Liu <wenjing.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c
index 2cec713..24e9ff6 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c
@@ -136,19 +136,8 @@ static void apg31_se_audio_setup(
        REG_UPDATE(APG_MEM_PWR, APG_MEM_PWR_FORCE, 0);
 }
 
-static void apg31_audio_mute_control(
-       struct apg *apg,
-       bool mute)
-{
-       if (mute)
-               apg31_disable(apg);
-       else
-               apg31_enable(apg);
-}
-
 static struct apg_funcs dcn31_apg_funcs = {
        .se_audio_setup                 = apg31_se_audio_setup,
-       .audio_mute_control             = apg31_audio_mute_control,
        .enable_apg                     = apg31_enable,
        .disable_apg                    = apg31_disable,
 };

diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h
index 24f568e..1b81f67 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h
+++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.h
@@ -84,10 +84,6 @@ struct apg_funcs {
                unsigned int az_inst,
                struct audio_info *audio_info);
 
-       void (*audio_mute_control)(
-               struct apg *apg,
-               bool mute);
-
        void (*enable_apg)(
                struct apg *apg);
 

diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c
index 814f401..16639bd 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c
@@ -600,14 +600,6 @@ static void dcn31_hpo_dp_stream_enc_map_stream_to_link(
        }
 }
 
-static void dcn31_hpo_dp_stream_enc_mute_control(
-       struct hpo_dp_stream_encoder *enc,
-       bool mute)
-{
-       ASSERT(enc->apg);
-       enc->apg->funcs->audio_mute_control(enc->apg, mute);
-}
-
 static void dcn31_hpo_dp_stream_enc_audio_setup(
        struct hpo_dp_stream_encoder *enc,
        unsigned int az_inst,
@@ -726,7 +718,6 @@ static const struct hpo_dp_stream_encoder_funcs dcn30_str_enc_funcs = {
        .stop_dp_info_packets = dcn31_hpo_dp_stream_enc_stop_dp_info_packets,
        .dp_set_dsc_pps_info_packet = dcn31_hpo_dp_stream_enc_set_dsc_pps_info_packet,
        .map_stream_to_link = dcn31_hpo_dp_stream_enc_map_stream_to_link,
-       .audio_mute_control = dcn31_hpo_dp_stream_enc_mute_control,
        .dp_audio_setup = dcn31_hpo_dp_stream_enc_audio_setup,
        .dp_audio_enable = dcn31_hpo_dp_stream_enc_audio_enable,
        .dp_audio_disable = dcn31_hpo_dp_stream_enc_audio_disable,

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 42afa19..6b3e6de 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
@@ -317,9 +317,6 @@ struct hpo_dp_stream_encoder_funcs {
                        uint32_t stream_enc_inst,
                        uint32_t link_enc_inst);
 
-       void (*audio_mute_control)(
-                       struct hpo_dp_stream_encoder *enc, bool mute);
-
        void (*dp_audio_setup)(
                        struct hpo_dp_stream_encoder *enc,
                        unsigned int az_inst,