ALSA: hda/hdmi: Switch to new stream-format interface

To provide option for selecting different bit-per-sample than just the
maximum one, use the new format calculation mechanism.

Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Acked-by: Jaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20231117120610.1755254-7-cezary.rojewski@intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 687b8b8fd7acb62511967d8128edf8e6df254d0d..dff2d72219829e75a4a1ee855762aaba30a547ea 100644 (file)
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -1655,7 +1655,6 @@ static void hdmi_present_sense_via_verbs(struct hdmi_spec_per_pin *per_pin,
 
 #define I915_SILENT_RATE               48000
 #define I915_SILENT_CHANNELS           2
-#define I915_SILENT_FORMAT             SNDRV_PCM_FORMAT_S16_LE
 #define I915_SILENT_FORMAT_BITS        16
 #define I915_SILENT_FMT_MASK           0xf
 
@@ -1668,8 +1667,8 @@ static void silent_stream_enable_i915(struct hda_codec *codec,
                                 per_pin->dev_id, I915_SILENT_RATE);
 
        /* trigger silent stream generation in hw */
-       format = snd_hdac_calc_stream_format(I915_SILENT_RATE, I915_SILENT_CHANNELS,
-                                            I915_SILENT_FORMAT, I915_SILENT_FORMAT_BITS, 0);
+       format = snd_hdac_stream_format(I915_SILENT_CHANNELS, I915_SILENT_FORMAT_BITS,
+                                       I915_SILENT_RATE);
        snd_hda_codec_setup_stream(codec, per_pin->cvt_nid,
                                   I915_SILENT_FMT_MASK, I915_SILENT_FMT_MASK, format);
        usleep_range(100, 200);