On Mon, 26 Jun 2023, Mitul Golani <mitulkumar.ajitkumar.golani@xxxxxxxxx> wrote:
> Initialize the source audio capabilities for HDMI in crtc_state
> property by setting them to their maximum supported values,
> including max_channel and max_frequency. This allows for the
> calculation of HDMI audio source capabilities with respect to
> the available mode bandwidth. These capabilities encompass
> parameters such as supported frequency and channel configurations.
>
> --v1:
> - Refactor max_channel and max_rate to this commit as it is being
> initialised here
> - Remove call for intel_audio_compute_eld to avoid any regression while
> merge. instead call it in different commit when it is defined.
> - Use int instead of unsigned int for max_channel and max_frequecy
> - Update commit message and header
>
> --v2:
> - Use signed instead of unsigned variables.
> - Avoid using magic numbers and give them proper name.
>
> Signed-off-by: Mitul Golani <mitulkumar.ajitkumar.golani@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_audio.h | 3 ++
> .../drm/i915/display/intel_display_types.h | 6 ++++
> drivers/gpu/drm/i915/display/intel_hdmi.c | 34 +++++++++++++++++++
> drivers/gpu/drm/i915/display/intel_hdmi.h | 1 +
> 4 files changed, 44 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_audio.h b/drivers/gpu/drm/i915/display/intel_audio.h
> index 07d034a981e9..be3edf9c4982 100644
> --- a/drivers/gpu/drm/i915/display/intel_audio.h
> +++ b/drivers/gpu/drm/i915/display/intel_audio.h
> @@ -13,6 +13,9 @@ struct drm_i915_private;
> struct intel_crtc_state;
> struct intel_encoder;
>
> +#define AUDIO_SAMPLE_CONTAINER_SIZE 32
> +#define MAX_CHANNEL_COUNT 8
These can be moved within intel_audio.c (see comment below).
> +
> void intel_audio_hooks_init(struct drm_i915_private *dev_priv);
> bool intel_audio_compute_config(struct intel_encoder *encoder,
> struct intel_crtc_state *crtc_state,
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
> index ebd147180a6e..74eee87d2df1 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -1131,6 +1131,12 @@ struct intel_crtc_state {
>
> struct {
> bool has_audio;
> +
> + /* Audio rate in Hz */
> + int max_frequency;
> +
> + /* Number of audio channels */
> + int max_channel;
> } audio;
>
> /*
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index 32157bef2eef..6a4d477e8a15 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -2277,6 +2277,39 @@ bool intel_hdmi_compute_has_hdmi_sink(struct intel_encoder *encoder,
> !intel_hdmi_is_cloned(crtc_state);
> }
>
> +static int calc_audio_bw(int channel, int frequency)
Please try to use more consistent naming. I suggest "channel_count" and
"frequency" (or "rate") throughout. Ditto for the max_ variants.
> +{
> + int bandwidth = channel * frequency * AUDIO_SAMPLE_CONTAINER_SIZE;
> + return bandwidth;
> +}
> +
> +void
> +intel_hdmi_audio_compute_config(struct intel_crtc_state *pipe_config)
> +{
> + struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;
> + int num_of_channel, aud_rates[] = {192000, 176000, 96000, 88000, 48000, 44100, 32000};
Please declare these separately, they are two completely two
things. Please add space after { and before }.
> + int audio_req_bandwidth, available_blank_bandwidth, vblank, hblank;
> +
> + hblank = adjusted_mode->htotal - adjusted_mode->hdisplay;
> + vblank = adjusted_mode->vtotal - adjusted_mode->vdisplay;
> + available_blank_bandwidth = hblank * vblank *
> + drm_mode_vrefresh(adjusted_mode) * pipe_config->pipe_bpp;
> + for (num_of_channel = MAX_CHANNEL_COUNT; num_of_channel > 0; num_of_channel--) {
> + for (int index = 0; index < ARRAY_SIZE(aud_rates); index++) {
Please don't declare index within the for loop.
> + audio_req_bandwidth = calc_audio_bw(num_of_channel,
> + aud_rates[index]);
> + if (audio_req_bandwidth < available_blank_bandwidth) {
> + pipe_config->audio.max_frequency = aud_rates[index];
> + pipe_config->audio.max_channel = num_of_channel;
> + return;
> + }
> + }
> + }
> +
> + pipe_config->audio.max_frequency = 0;
> + pipe_config->audio.max_channel = 0;
> +}
> +
I think the above should be moved to intel_audio.c as static and called
directly from intel_audio_compute_config(). There's no reason for the
above to be in intel_hdmi.c.
> int intel_hdmi_compute_config(struct intel_encoder *encoder,
> struct intel_crtc_state *pipe_config,
> struct drm_connector_state *conn_state)
> @@ -2344,6 +2377,7 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder,
> pipe_config->hdmi_high_tmds_clock_ratio = true;
> }
> }
> + intel_hdmi_audio_compute_config(pipe_config);
>
> intel_hdmi_compute_gcp_infoframe(encoder, pipe_config,
> conn_state);
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.h b/drivers/gpu/drm/i915/display/intel_hdmi.h
> index 6b39df38d57a..6df303daf348 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.h
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.h
> @@ -27,6 +27,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *dig_port,
> bool intel_hdmi_compute_has_hdmi_sink(struct intel_encoder *encoder,
> const struct intel_crtc_state *crtc_state,
> const struct drm_connector_state *conn_state);
> +void intel_hdmi_audio_compute_config(struct intel_crtc_state *pipe_config);
> int intel_hdmi_compute_config(struct intel_encoder *encoder,
> struct intel_crtc_state *pipe_config,
> struct drm_connector_state *conn_state);
--
Jani Nikula, Intel Open Source Graphics Center
