drm/amd/display: Don't enable AFMT for DP audio stream

[WHY]
AFMT is unused for DP audio, so powering it on for DP is unnecessary.

[HOW]
APG block should be powered down instead, however HW defaults to shutdown
state when not enabled so no further work is required.

Reviewed-by: Wenjing Liu <wenjing.liu@amd.com>
Acked-by: Anson Jacob <Anson.Jacob@amd.com>
Signed-off-by: Michael Strauss <michael.strauss@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 a97bdaa54f73472d4ace30ba68a60b1de9f5767b..687c3c6881a986f8aa9012f74a08dcb2c7819093 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
@@ -1402,11 +1402,6 @@ static void enc1_se_disable_dp_audio(
        struct dcn10_stream_encoder *enc1 = DCN10STRENC_FROM_STRENC(enc);
        uint32_t value = 0;
 
-#if defined(CONFIG_DRM_AMD_DC_DCN)
-       if (enc->afmt && enc->afmt->funcs->afmt_powerdown)
-               enc->afmt->funcs->afmt_powerdown(enc->afmt);
-#endif
-
        /* Disable Audio packets */
        REG_UPDATE_5(DP_SEC_CNTL,
                        DP_SEC_ASP_ENABLE, 0,

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 3ea6dacec80c048b0094415651fa323e53f35c75..ebd9c35c914f26352e5fc522f972c6e5eed2dd13 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
@@ -710,8 +710,6 @@ static void enc3_se_setup_dp_audio(
 static void enc3_se_dp_audio_enable(
        struct stream_encoder *enc)
 {
-       if (enc->afmt->funcs->afmt_poweron)
-               enc->afmt->funcs->afmt_poweron(enc->afmt);
        enc1_se_enable_audio_clock(enc, true);
        enc3_se_setup_dp_audio(enc);
        enc1_se_enable_dp_audio(enc);