drm/amd/display: HDMI 2.x audio bandwidth check

Add HDMI 2.x audio bandwidth check

Signed-off-by: Charlene Liu <charlene.liu@amd.com>
Reviewed-by: Chris Park <Chris.Park@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@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 0c19de6..6c6f564 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -2811,3 +2811,51 @@ unsigned int resource_pixel_format_to_bpp(enum surface_pixel_format format)
                return -1;
        }
 }
+static unsigned int get_max_audio_sample_rate(struct audio_mode *modes)
+{
+       if (modes) {
+               if (modes->sample_rates.rate.RATE_192)
+                       return 192000;
+               if (modes->sample_rates.rate.RATE_176_4)
+                       return 176400;
+               if (modes->sample_rates.rate.RATE_96)
+                       return 96000;
+               if (modes->sample_rates.rate.RATE_88_2)
+                       return 88200;
+               if (modes->sample_rates.rate.RATE_48)
+                       return 48000;
+               if (modes->sample_rates.rate.RATE_44_1)
+                       return 44100;
+               if (modes->sample_rates.rate.RATE_32)
+                       return 32000;
+       }
+       /*original logic when no audio info*/
+       return 441000;
+}
+
+void get_audio_check(struct audio_info *aud_modes,
+       struct audio_check *audio_chk)
+{
+       unsigned int i;
+       unsigned int max_sample_rate = 0;
+
+       if (aud_modes) {
+               audio_chk->audio_packet_type = 0x2;/*audio sample packet AP = .25 for layout0, 1 for layout1*/
+
+               audio_chk->max_audiosample_rate = 0;
+               for (i = 0; i < aud_modes->mode_count; i++) {
+                       max_sample_rate = get_max_audio_sample_rate(&aud_modes->modes[i]);
+                       if (audio_chk->max_audiosample_rate < max_sample_rate)
+                               audio_chk->max_audiosample_rate = max_sample_rate;
+                       /*dts takes the same as type 2: AP = 0.25*/
+               }
+               /*check which one take more bandwidth*/
+               if (audio_chk->max_audiosample_rate > 192000)
+                       audio_chk->audio_packet_type = 0x9;/*AP =1*/
+               audio_chk->acat = 0;/*not support*/
+       }
+}
+
+
+
+

diff --git a/drivers/gpu/drm/amd/display/dc/dc_types.h b/drivers/gpu/drm/amd/display/dc/dc_types.h
index 2b92bfa..2cce8ed 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc_types.h
+++ b/drivers/gpu/drm/amd/display/dc/dc_types.h
@@ -598,7 +598,11 @@ struct audio_info {
        /* this field must be last in this struct */
        struct audio_mode modes[DC_MAX_AUDIO_DESC_COUNT];
 };
-
+struct audio_check {
+       unsigned int audio_packet_type;
+       unsigned int max_audiosample_rate;
+       unsigned int acat;
+};
 enum dc_infoframe_type {
        DC_HDMI_INFOFRAME_TYPE_VENDOR = 0x81,
        DC_HDMI_INFOFRAME_TYPE_AVI = 0x82,

diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h b/drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h
index 220d5e6..dbf6a02 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h
+++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h
@@ -278,6 +278,7 @@ struct _vcs_dpi_display_output_params_st {
        int output_type;
        int output_format;
        int dsc_slices;
+       int max_audio_sample_rate;
        struct writeback_st wb;
 };
 

diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
index 15b72a8..66ca014 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
@@ -454,7 +454,7 @@ static void fetch_pipe_params(struct display_mode_lib *mode_lib)
                                dout->dp_lanes;
                /* TODO: Needs to be set based on dout->audio.audio_sample_rate_khz/sample_layout */
                mode_lib->vba.AudioSampleRate[mode_lib->vba.NumberOfActivePlanes] =
-                       44.1 * 1000;
+                       dout->max_audio_sample_rate;
                mode_lib->vba.AudioSampleLayout[mode_lib->vba.NumberOfActivePlanes] =
                        1;
                mode_lib->vba.DRAMClockChangeLatencyOverride = 0.0;

diff --git a/drivers/gpu/drm/amd/display/dc/inc/resource.h b/drivers/gpu/drm/amd/display/dc/inc/resource.h
index 7a85abc..5ae8ada 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/resource.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/resource.h
@@ -177,4 +177,6 @@ void update_audio_usage(
 
 unsigned int resource_pixel_format_to_bpp(enum surface_pixel_format format);
 
+void get_audio_check(struct audio_info *aud_modes,
+       struct audio_check *aud_chk);
 #endif /* DRIVERS_GPU_DRM_AMD_DC_DEV_DC_INC_RESOURCE_H_ */