drm/amd/display: Move RGB-type check for audio sync to DCE HW sequence

[Why&How]
DVI-A & VGA connectors are applicable to DCE ASICs, so move them to
dce110_hwseq.c to block audio sync on SIGNAL_TYPE_RGB for DCE ASICs.

Signed-off-by: Ivan Lipski <ivan.lipski@amd.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Tested-by: Dan Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
index 98c6dfb1679662a88f60555796a1147bb01a019a..8fe39993922029f743a73cf97e5a00906221fd38 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
@@ -1102,6 +1102,9 @@ void dce110_enable_audio_stream(struct pipe_ctx *pipe_ctx)
        if (!pipe_ctx->stream)
                return;
 
+       if (dc_is_rgb_signal(pipe_ctx->stream->signal))
+               return;
+
        dc = pipe_ctx->stream->ctx->dc;
        clk_mgr = dc->clk_mgr;
        link_hwss = get_link_hwss(pipe_ctx->stream->link, &pipe_ctx->link_res);

diff --git a/drivers/gpu/drm/amd/display/dc/link/link_dpms.c b/drivers/gpu/drm/amd/display/dc/link/link_dpms.c
index 6960eff5816dd1d5af31ac751e040f5f295438a3..6ae134147617167a3bb84ecc556cb5852a9f8f81 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/link/link_dpms.c
+++ b/drivers/gpu/drm/amd/display/dc/link/link_dpms.c
@@ -2666,8 +2666,7 @@ void link_set_dpms_on(
                enable_stream_features(pipe_ctx);
        update_psp_stream_config(pipe_ctx, false);
 
-       if (!dc_is_rgb_signal(pipe_ctx->stream->signal))
-               dc->hwss.enable_audio_stream(pipe_ctx);
+       dc->hwss.enable_audio_stream(pipe_ctx);
 
        if (dc_is_hdmi_signal(pipe_ctx->stream->signal)) {
                set_avmute(pipe_ctx, false);