|
@@ -598,21 +598,19 @@ void hdmi_eld_update_pcm_info(struct hdmi_eld *eld, struct hda_pcm_stream *pcm,
|
|
|
{
|
|
|
int i;
|
|
|
|
|
|
- pcm->rates = 0;
|
|
|
- pcm->formats = 0;
|
|
|
- pcm->maxbps = 0;
|
|
|
- pcm->channels_max = 0;
|
|
|
+ /* assume basic audio support (the basic audio flag is not in ELD;
|
|
|
+ * however, all audio capable sinks are required to support basic
|
|
|
+ * audio) */
|
|
|
+ pcm->rates = SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000;
|
|
|
+ pcm->formats = SNDRV_PCM_FMTBIT_S16_LE;
|
|
|
+ pcm->maxbps = 16;
|
|
|
+ pcm->channels_max = 2;
|
|
|
for (i = 0; i < eld->sad_count; i++) {
|
|
|
struct cea_sad *a = &eld->sad[i];
|
|
|
pcm->rates |= a->rates;
|
|
|
if (a->channels > pcm->channels_max)
|
|
|
pcm->channels_max = a->channels;
|
|
|
if (a->format == AUDIO_CODING_TYPE_LPCM) {
|
|
|
- if (a->sample_bits & AC_SUPPCM_BITS_16) {
|
|
|
- pcm->formats |= SNDRV_PCM_FMTBIT_S16_LE;
|
|
|
- if (pcm->maxbps < 16)
|
|
|
- pcm->maxbps = 16;
|
|
|
- }
|
|
|
if (a->sample_bits & AC_SUPPCM_BITS_20) {
|
|
|
pcm->formats |= SNDRV_PCM_FMTBIT_S32_LE;
|
|
|
if (pcm->maxbps < 20)
|