| Message ID | 20230609174212.1946930-4-mitulkumar.ajitkumar.golani@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Get optimal audio frequency and channels | expand |
Hello Mitul, > -----Original Message----- > From: Golani, Mitulkumar Ajitkumar <mitulkumar.ajitkumar.golani@intel.com> > Sent: Friday, June 9, 2023 11:12 PM > To: intel-gfx@lists.freedesktop.org > Cc: Shankar, Uma <uma.shankar@intel.com>; Borah, Chaitanya Kumar > <chaitanya.kumar.borah@intel.com>; Golani, Mitulkumar Ajitkumar > <mitulkumar.ajitkumar.golani@intel.com>; Nautiyal, Ankit K > <ankit.k.nautiyal@intel.com> > Subject: [RFC 3/3] drm/i915/display: Add wrapper to Compute SAD > > Compute SADs that takes into account the supported rate and channel based > on the capabilities of the audio source. This wrapper function should > encapsulate the logic for determining the supported rate and channel and > should return a set of SADs that are compatible with the source. > > --v1: > - call intel_audio_compute_eld in this commit as it is defined here > > Signed-off-by: Mitul Golani <mitulkumar.ajitkumar.golani@intel.com> > --- > drivers/gpu/drm/i915/display/intel_audio.c | 66 ++++++++++++++++++++++ > drivers/gpu/drm/i915/display/intel_audio.h | 1 + > drivers/gpu/drm/i915/display/intel_hdmi.c | 2 + > 3 files changed, 69 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_audio.c > b/drivers/gpu/drm/i915/display/intel_audio.c > index e20ffc8e9654..a6a58b0f0717 100644 > --- a/drivers/gpu/drm/i915/display/intel_audio.c > +++ b/drivers/gpu/drm/i915/display/intel_audio.c > @@ -794,6 +794,72 @@ bool intel_audio_compute_config(struct > intel_encoder *encoder, > return true; > } > > +static unsigned int drm_sad_to_channels(const u8 *sad) { > + return 1 + (sad[0] & 0x7); > +} > + We can do away with the drm_ prefix here. > +static inline u8 *parse_sad(u8 *eld) > +{ Nit: eld_to_sad() could be a better name here. > + unsigned int ver, mnl; > + > + ver = (eld[DRM_ELD_VER] & DRM_ELD_VER_MASK) >> > DRM_ELD_VER_SHIFT; > + if (ver != 2 && ver != 31) > + return NULL; > + > + mnl = drm_eld_mnl(eld); > + if (mnl > 16) > + return NULL; > + > + return eld + DRM_ELD_CEA_SAD(mnl, 0); > +} > + > +static u8 get_supported_freq_mask(struct intel_crtc_state *crtc_state) > +{ > + int audio_freq_hz[] = {32000, 44100, 48000, 88000, 96000, 176000, > 192000, 0}; Please check if we really need this trailing 0 here. To cover the case where the maximum rate is set to 0Hz(init value) we can have a check of if (crtc_state->audio.max_frequency < 32000) Regards Chaitanya > + u8 mask = 0; > + > + for (u8 index = 0; index < ARRAY_SIZE(audio_freq_hz); index++) { > + mask |= 1 << index; > + if (crtc_state->audio.max_frequency != audio_freq_hz[index]) > + continue; > + else > + break; > + } > + > + return mask; > +} > + > +void intel_audio_compute_eld(struct intel_crtc_state *crtc_state) { > + struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev); > + u8 *eld, *sad, index, mask = 0; > + > + eld = crtc_state->eld; > + if (!eld) { > + drm_err(&i915->drm, "failed to locate eld\n"); > + return; > + } > + > + sad = (u8 *)parse_sad(eld); > + if (sad) { > + mask = get_supported_freq_mask(crtc_state); > + > + for (index = 0; index < drm_eld_sad_count(eld); index++, sad > += 3) { > + /* > + * Respect to source restrictions. If source limit is > greater than sink > + * capabilities then follow to sink's highest supported > rate. > + */ > + if (drm_sad_to_channels(sad) >= crtc_state- > >audio.max_channel) { > + sad[0] &= ~0x7; > + sad[0] |= crtc_state->audio.max_channel - 1; > + } > + > + sad[1] &= mask; > + } > + } > +} > + > /** > * intel_audio_codec_enable - Enable the audio codec for HD audio > * @encoder: encoder on which to enable audio diff --git > a/drivers/gpu/drm/i915/display/intel_audio.h > b/drivers/gpu/drm/i915/display/intel_audio.h > index 07d034a981e9..2ec7fafd9711 100644 > --- a/drivers/gpu/drm/i915/display/intel_audio.h > +++ b/drivers/gpu/drm/i915/display/intel_audio.h > @@ -14,6 +14,7 @@ struct intel_crtc_state; struct intel_encoder; > > void intel_audio_hooks_init(struct drm_i915_private *dev_priv); > +void intel_audio_compute_eld(struct intel_crtc_state *crtc_state); > bool intel_audio_compute_config(struct intel_encoder *encoder, > struct intel_crtc_state *crtc_state, > struct drm_connector_state *conn_state); diff > --git a/drivers/gpu/drm/i915/display/intel_hdmi.c > b/drivers/gpu/drm/i915/display/intel_hdmi.c > index 0188a600f9f5..beafeff494f8 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > @@ -2403,6 +2403,8 @@ int intel_hdmi_compute_config(struct intel_encoder > *encoder, > return -EINVAL; > } > > + intel_audio_compute_eld(pipe_config); > + > return 0; > } > > -- > 2.25.1
Hi Chaitanya, > -----Original Message----- > From: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com> > Sent: 15 June 2023 09:30 > To: Golani, Mitulkumar Ajitkumar <mitulkumar.ajitkumar.golani@intel.com>; > intel-gfx@lists.freedesktop.org > Cc: Shankar, Uma <uma.shankar@intel.com>; Nautiyal, Ankit K > <ankit.k.nautiyal@intel.com> > Subject: RE: [RFC 3/3] drm/i915/display: Add wrapper to Compute SAD > > Hello Mitul, > > > -----Original Message----- > > From: Golani, Mitulkumar Ajitkumar > > <mitulkumar.ajitkumar.golani@intel.com> > > Sent: Friday, June 9, 2023 11:12 PM > > To: intel-gfx@lists.freedesktop.org > > Cc: Shankar, Uma <uma.shankar@intel.com>; Borah, Chaitanya Kumar > > <chaitanya.kumar.borah@intel.com>; Golani, Mitulkumar Ajitkumar > > <mitulkumar.ajitkumar.golani@intel.com>; Nautiyal, Ankit K > > <ankit.k.nautiyal@intel.com> > > Subject: [RFC 3/3] drm/i915/display: Add wrapper to Compute SAD > > > > Compute SADs that takes into account the supported rate and channel > > based on the capabilities of the audio source. This wrapper function > > should encapsulate the logic for determining the supported rate and > > channel and should return a set of SADs that are compatible with the > source. > > > > --v1: > > - call intel_audio_compute_eld in this commit as it is defined here > > > > Signed-off-by: Mitul Golani <mitulkumar.ajitkumar.golani@intel.com> > > --- > > drivers/gpu/drm/i915/display/intel_audio.c | 66 > > ++++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_audio.h | 1 > > + drivers/gpu/drm/i915/display/intel_hdmi.c | 2 + > > 3 files changed, 69 insertions(+) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_audio.c > > b/drivers/gpu/drm/i915/display/intel_audio.c > > index e20ffc8e9654..a6a58b0f0717 100644 > > --- a/drivers/gpu/drm/i915/display/intel_audio.c > > +++ b/drivers/gpu/drm/i915/display/intel_audio.c > > @@ -794,6 +794,72 @@ bool intel_audio_compute_config(struct > > intel_encoder *encoder, > > return true; > > } > > > > +static unsigned int drm_sad_to_channels(const u8 *sad) { > > + return 1 + (sad[0] & 0x7); > > +} > > + > > We can do away with the drm_ prefix here. Thanks for pointing out. Somehow missed while migrating. Pushed fix with new revision. > > > +static inline u8 *parse_sad(u8 *eld) > > +{ > > Nit: eld_to_sad() could be a better name here. Sure. Corrected in new revision set. > > > + unsigned int ver, mnl; > > + > > + ver = (eld[DRM_ELD_VER] & DRM_ELD_VER_MASK) >> > > DRM_ELD_VER_SHIFT; > > + if (ver != 2 && ver != 31) > > + return NULL; > > + > > + mnl = drm_eld_mnl(eld); > > + if (mnl > 16) > > + return NULL; > > + > > + return eld + DRM_ELD_CEA_SAD(mnl, 0); } > > + > > +static u8 get_supported_freq_mask(struct intel_crtc_state > > +*crtc_state) { > > + int audio_freq_hz[] = {32000, 44100, 48000, 88000, 96000, 176000, > > 192000, 0}; > > Please check if we really need this trailing 0 here. > > To cover the case where the maximum rate is set to 0Hz(init value) we can > have a check of > > if (crtc_state->audio.max_frequency < 32000) > > > Regards > > Chaitanya Right Good catch. It would have sent 0xff in that case. Corrected and sent with new revision. Thanks, Mitul > > > + u8 mask = 0; > > + > > + for (u8 index = 0; index < ARRAY_SIZE(audio_freq_hz); index++) { > > + mask |= 1 << index; > > + if (crtc_state->audio.max_frequency != > audio_freq_hz[index]) > > + continue; > > + else > > + break; > > + } > > + > > + return mask; > > +} > > + > > +void intel_audio_compute_eld(struct intel_crtc_state *crtc_state) { > > + struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev); > > + u8 *eld, *sad, index, mask = 0; > > + > > + eld = crtc_state->eld; > > + if (!eld) { > > + drm_err(&i915->drm, "failed to locate eld\n"); > > + return; > > + } > > + > > + sad = (u8 *)parse_sad(eld); > > + if (sad) { > > + mask = get_supported_freq_mask(crtc_state); > > + > > + for (index = 0; index < drm_eld_sad_count(eld); index++, sad > = 3) { > > + /* > > + * Respect to source restrictions. If source limit is > > greater than sink > > + * capabilities then follow to sink's highest supported > > rate. > > + */ > > + if (drm_sad_to_channels(sad) >= crtc_state- > > >audio.max_channel) { > > + sad[0] &= ~0x7; > > + sad[0] |= crtc_state->audio.max_channel - 1; > > + } > > + > > + sad[1] &= mask; > > + } > > + } > > +} > > + > > /** > > * intel_audio_codec_enable - Enable the audio codec for HD audio > > * @encoder: encoder on which to enable audio diff --git > > a/drivers/gpu/drm/i915/display/intel_audio.h > > b/drivers/gpu/drm/i915/display/intel_audio.h > > index 07d034a981e9..2ec7fafd9711 100644 > > --- a/drivers/gpu/drm/i915/display/intel_audio.h > > +++ b/drivers/gpu/drm/i915/display/intel_audio.h > > @@ -14,6 +14,7 @@ struct intel_crtc_state; struct intel_encoder; > > > > void intel_audio_hooks_init(struct drm_i915_private *dev_priv); > > +void intel_audio_compute_eld(struct intel_crtc_state *crtc_state); > > bool intel_audio_compute_config(struct intel_encoder *encoder, > > struct intel_crtc_state *crtc_state, > > struct drm_connector_state *conn_state); > diff --git > > a/drivers/gpu/drm/i915/display/intel_hdmi.c > > b/drivers/gpu/drm/i915/display/intel_hdmi.c > > index 0188a600f9f5..beafeff494f8 100644 > > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > > @@ -2403,6 +2403,8 @@ int intel_hdmi_compute_config(struct > > intel_encoder *encoder, > > return -EINVAL; > > } > > > > + intel_audio_compute_eld(pipe_config); > > + > > return 0; > > } > > > > -- > > 2.25.1
Hi, [+Jyri] On Fri, 9 Jun 2023, Mitul Golani wrote: > Compute SADs that takes into account the supported rate and channel > based on the capabilities of the audio source. This wrapper function > should encapsulate the logic for determining the supported rate and > channel and should return a set of SADs that are compatible with the > source. In general looks good. A few minor comments inline: > +static u8 get_supported_freq_mask(struct intel_crtc_state *crtc_state) > +{ > + int audio_freq_hz[] = {32000, 44100, 48000, 88000, 96000, 176000, 192000, 0}; > + u8 mask = 0; > + > + for (u8 index = 0; index < ARRAY_SIZE(audio_freq_hz); index++) { Minor nitpick: the use of "u8" in many places seems a bit misleading. It seems for many places (like the "index" here), you can just use int. But right, the SAD mask is 8bit, so maybe the get_support_freq_mask() is still warranted to return a u8 mask. > +void intel_audio_compute_eld(struct intel_crtc_state *crtc_state) > +{ > + struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev); > + u8 *eld, *sad, index, mask = 0; > + > + eld = crtc_state->eld; > + if (!eld) { > + drm_err(&i915->drm, "failed to locate eld\n"); > + return; > + } > + > + sad = (u8 *)parse_sad(eld); > + if (sad) { > + mask = get_supported_freq_mask(crtc_state); > + > + for (index = 0; index < drm_eld_sad_count(eld); index++, sad += 3) { > + /* > + * Respect to source restrictions. If source limit is greater than sink > + * capabilities then follow to sink's highest supported rate. > + */ Minor: maybe reword "Respect source restricitions. Limit capabilities to a subset that is supported both by the source and the sink."? > + if (drm_sad_to_channels(sad) >= crtc_state->audio.max_channel) { > + sad[0] &= ~0x7; > + sad[0] |= crtc_state->audio.max_channel - 1; Can we add a debug trace here in case the channel count is limited? Br, Kai
Hi Kai, > -----Original Message----- > From: Kai Vehmanen <kai.vehmanen@linux.intel.com> > Sent: 19 June 2023 16:50 > To: Golani, Mitulkumar Ajitkumar <mitulkumar.ajitkumar.golani@intel.com> > Cc: intel-gfx@lists.freedesktop.org; jyri.sarha@linux.intel.com > Subject: Re: [Intel-gfx] [RFC 3/3] drm/i915/display: Add wrapper to Compute > SAD > > Hi, > > [+Jyri] > > On Fri, 9 Jun 2023, Mitul Golani wrote: > > > Compute SADs that takes into account the supported rate and channel > > based on the capabilities of the audio source. This wrapper function > > should encapsulate the logic for determining the supported rate and > > channel and should return a set of SADs that are compatible with the > > source. > > In general looks good. A few minor comments inline: > > > +static u8 get_supported_freq_mask(struct intel_crtc_state > > +*crtc_state) { > > + int audio_freq_hz[] = {32000, 44100, 48000, 88000, 96000, 176000, > 192000, 0}; > > + u8 mask = 0; > > + > > + for (u8 index = 0; index < ARRAY_SIZE(audio_freq_hz); index++) { > > Minor nitpick: the use of "u8" in many places seems a bit misleading. It > seems for many places (like the "index" here), you can just use int. > But right, the SAD mask is 8bit, so maybe the get_support_freq_mask() is still > warranted to return a u8 mask. Thanks for inputs. Few more places where I could have avoided using u8. I will push the correction with new revision. > > > +void intel_audio_compute_eld(struct intel_crtc_state *crtc_state) { > > + struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev); > > + u8 *eld, *sad, index, mask = 0; > > + > > + eld = crtc_state->eld; > > + if (!eld) { > > + drm_err(&i915->drm, "failed to locate eld\n"); > > + return; > > + } > > + > > + sad = (u8 *)parse_sad(eld); > > + if (sad) { > > + mask = get_supported_freq_mask(crtc_state); > > + > > + for (index = 0; index < drm_eld_sad_count(eld); index++, sad > += 3) { > > + /* > > + * Respect to source restrictions. If source limit is > greater than sink > > + * capabilities then follow to sink's highest supported > rate. > > + */ > > Minor: maybe reword "Respect source restricitions. Limit capabilities to a > subset that is supported both by the source and the sink."? Thanks for inputs. Few more places where I could have avoided using u8. I will push the correction with new revision. > > > + if (drm_sad_to_channels(sad) >= crtc_state- > >audio.max_channel) { > > + sad[0] &= ~0x7; > > + sad[0] |= crtc_state->audio.max_channel - 1; > > Can we add a debug trace here in case the channel count is limited? > > Br, Kai
diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c index e20ffc8e9654..a6a58b0f0717 100644 --- a/drivers/gpu/drm/i915/display/intel_audio.c +++ b/drivers/gpu/drm/i915/display/intel_audio.c @@ -794,6 +794,72 @@ bool intel_audio_compute_config(struct intel_encoder *encoder, return true; } +static unsigned int drm_sad_to_channels(const u8 *sad) +{ + return 1 + (sad[0] & 0x7); +} + +static inline u8 *parse_sad(u8 *eld) +{ + unsigned int ver, mnl; + + ver = (eld[DRM_ELD_VER] & DRM_ELD_VER_MASK) >> DRM_ELD_VER_SHIFT; + if (ver != 2 && ver != 31) + return NULL; + + mnl = drm_eld_mnl(eld); + if (mnl > 16) + return NULL; + + return eld + DRM_ELD_CEA_SAD(mnl, 0); +} + +static u8 get_supported_freq_mask(struct intel_crtc_state *crtc_state) +{ + int audio_freq_hz[] = {32000, 44100, 48000, 88000, 96000, 176000, 192000, 0}; + u8 mask = 0; + + for (u8 index = 0; index < ARRAY_SIZE(audio_freq_hz); index++) { + mask |= 1 << index; + if (crtc_state->audio.max_frequency != audio_freq_hz[index]) + continue; + else + break; + } + + return mask; +} + +void intel_audio_compute_eld(struct intel_crtc_state *crtc_state) +{ + struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev); + u8 *eld, *sad, index, mask = 0; + + eld = crtc_state->eld; + if (!eld) { + drm_err(&i915->drm, "failed to locate eld\n"); + return; + } + + sad = (u8 *)parse_sad(eld); + if (sad) { + mask = get_supported_freq_mask(crtc_state); + + for (index = 0; index < drm_eld_sad_count(eld); index++, sad += 3) { + /* + * Respect to source restrictions. If source limit is greater than sink + * capabilities then follow to sink's highest supported rate. + */ + if (drm_sad_to_channels(sad) >= crtc_state->audio.max_channel) { + sad[0] &= ~0x7; + sad[0] |= crtc_state->audio.max_channel - 1; + } + + sad[1] &= mask; + } + } +} + /** * intel_audio_codec_enable - Enable the audio codec for HD audio * @encoder: encoder on which to enable audio diff --git a/drivers/gpu/drm/i915/display/intel_audio.h b/drivers/gpu/drm/i915/display/intel_audio.h index 07d034a981e9..2ec7fafd9711 100644 --- a/drivers/gpu/drm/i915/display/intel_audio.h +++ b/drivers/gpu/drm/i915/display/intel_audio.h @@ -14,6 +14,7 @@ struct intel_crtc_state; struct intel_encoder; void intel_audio_hooks_init(struct drm_i915_private *dev_priv); +void intel_audio_compute_eld(struct intel_crtc_state *crtc_state); bool intel_audio_compute_config(struct intel_encoder *encoder, struct intel_crtc_state *crtc_state, struct drm_connector_state *conn_state); diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index 0188a600f9f5..beafeff494f8 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -2403,6 +2403,8 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder, return -EINVAL; } + intel_audio_compute_eld(pipe_config); + return 0; }
Compute SADs that takes into account the supported rate and channel based on the capabilities of the audio source. This wrapper function should encapsulate the logic for determining the supported rate and channel and should return a set of SADs that are compatible with the source. --v1: - call intel_audio_compute_eld in this commit as it is defined here Signed-off-by: Mitul Golani <mitulkumar.ajitkumar.golani@intel.com> --- drivers/gpu/drm/i915/display/intel_audio.c | 66 ++++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_audio.h | 1 + drivers/gpu/drm/i915/display/intel_hdmi.c | 2 + 3 files changed, 69 insertions(+)