drm/amd/display: Monitor patch to ignore EDID audio SAB check

[Why & How]
Some monitor have audio output but SAB data is zero. Skip
check this in this case.

Reviewed-by: Charlene Liu <charlene.liu@amd.com>
Reviewed-by: Jun Lei <jun.lei@amd.com>
Signed-off-by: Fudongwang <Fudong.Wang@amd.com>
Signed-off-by: Ivan Lipski <ivan.lipski@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index 854fc51f159c1a3e58c73d1cb08e48986cdaaa4f..4d6181e7c612b9b7b9f8e12461b1ea8d616c4461 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -3940,7 +3940,9 @@ enum dc_status resource_map_pool_resources(
        /* TODO: Add check if ASIC support and EDID audio */
        if (!stream->converter_disable_audio &&
            dc_is_audio_capable_signal(pipe_ctx->stream->signal) &&
-           stream->audio_info.mode_count && stream->audio_info.flags.all) {
+           stream->audio_info.mode_count &&
+               (stream->audio_info.flags.all ||
+               (stream->sink && stream->sink->edid_caps.panel_patch.skip_audio_sab_check))) {
                pipe_ctx->stream_res.audio = find_first_free_audio(
                &context->res_ctx, pool, pipe_ctx->stream_res.stream_enc->id, dc_ctx->dce_version);
 

diff --git a/drivers/gpu/drm/amd/display/dc/dc_types.h b/drivers/gpu/drm/amd/display/dc/dc_types.h
index 229a754b7b6eb09c675c82c74d6ddead9ae4feec..375ca2f13b7ac00d7e349d8715cca5599950a47e 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_types.h
@@ -175,6 +175,7 @@ struct dc_panel_patch {
        unsigned int embedded_tiled_slave;
        unsigned int disable_fams;
        unsigned int skip_avmute;
+       unsigned int skip_audio_sab_check;
        unsigned int mst_start_top_delay;
        unsigned int remove_sink_ext_caps;
        unsigned int disable_colorimetry;