diff options
Diffstat (limited to 'sound/pci/hda/patch_hdmi.c')
-rw-r--r-- | sound/pci/hda/patch_hdmi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index b4218a19df22..be0a9ee0b804 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c | |||
@@ -1127,10 +1127,6 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, | |||
1127 | AMP_OUT_UNMUTE); | 1127 | AMP_OUT_UNMUTE); |
1128 | 1128 | ||
1129 | eld = &per_pin->sink_eld; | 1129 | eld = &per_pin->sink_eld; |
1130 | if (!eld->monitor_present) { | ||
1131 | hdmi_set_channel_count(codec, per_pin->cvt_nid, channels); | ||
1132 | return; | ||
1133 | } | ||
1134 | 1130 | ||
1135 | if (!non_pcm && per_pin->chmap_set) | 1131 | if (!non_pcm && per_pin->chmap_set) |
1136 | ca = hdmi_manual_channel_allocation(channels, per_pin->chmap); | 1132 | ca = hdmi_manual_channel_allocation(channels, per_pin->chmap); |
@@ -3324,6 +3320,7 @@ static const struct hda_codec_preset snd_hda_preset_hdmi[] = { | |||
3324 | { .id = 0x10de001a, .name = "GPU 1a HDMI/DP", .patch = patch_nvhdmi }, | 3320 | { .id = 0x10de001a, .name = "GPU 1a HDMI/DP", .patch = patch_nvhdmi }, |
3325 | { .id = 0x10de001b, .name = "GPU 1b HDMI/DP", .patch = patch_nvhdmi }, | 3321 | { .id = 0x10de001b, .name = "GPU 1b HDMI/DP", .patch = patch_nvhdmi }, |
3326 | { .id = 0x10de001c, .name = "GPU 1c HDMI/DP", .patch = patch_nvhdmi }, | 3322 | { .id = 0x10de001c, .name = "GPU 1c HDMI/DP", .patch = patch_nvhdmi }, |
3323 | { .id = 0x10de0028, .name = "Tegra12x HDMI", .patch = patch_nvhdmi }, | ||
3327 | { .id = 0x10de0040, .name = "GPU 40 HDMI/DP", .patch = patch_nvhdmi }, | 3324 | { .id = 0x10de0040, .name = "GPU 40 HDMI/DP", .patch = patch_nvhdmi }, |
3328 | { .id = 0x10de0041, .name = "GPU 41 HDMI/DP", .patch = patch_nvhdmi }, | 3325 | { .id = 0x10de0041, .name = "GPU 41 HDMI/DP", .patch = patch_nvhdmi }, |
3329 | { .id = 0x10de0042, .name = "GPU 42 HDMI/DP", .patch = patch_nvhdmi }, | 3326 | { .id = 0x10de0042, .name = "GPU 42 HDMI/DP", .patch = patch_nvhdmi }, |
@@ -3380,6 +3377,7 @@ MODULE_ALIAS("snd-hda-codec-id:10de0019"); | |||
3380 | MODULE_ALIAS("snd-hda-codec-id:10de001a"); | 3377 | MODULE_ALIAS("snd-hda-codec-id:10de001a"); |
3381 | MODULE_ALIAS("snd-hda-codec-id:10de001b"); | 3378 | MODULE_ALIAS("snd-hda-codec-id:10de001b"); |
3382 | MODULE_ALIAS("snd-hda-codec-id:10de001c"); | 3379 | MODULE_ALIAS("snd-hda-codec-id:10de001c"); |
3380 | MODULE_ALIAS("snd-hda-codec-id:10de0028"); | ||
3383 | MODULE_ALIAS("snd-hda-codec-id:10de0040"); | 3381 | MODULE_ALIAS("snd-hda-codec-id:10de0040"); |
3384 | MODULE_ALIAS("snd-hda-codec-id:10de0041"); | 3382 | MODULE_ALIAS("snd-hda-codec-id:10de0041"); |
3385 | MODULE_ALIAS("snd-hda-codec-id:10de0042"); | 3383 | MODULE_ALIAS("snd-hda-codec-id:10de0042"); |