diff options
Diffstat (limited to 'sound/pci/hda/patch_hdmi.c')
-rw-r--r-- | sound/pci/hda/patch_hdmi.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 0cb5b89cd0c8..b4218a19df22 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c | |||
@@ -1127,8 +1127,10 @@ 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) | 1130 | if (!eld->monitor_present) { |
1131 | hdmi_set_channel_count(codec, per_pin->cvt_nid, channels); | ||
1131 | return; | 1132 | return; |
1133 | } | ||
1132 | 1134 | ||
1133 | if (!non_pcm && per_pin->chmap_set) | 1135 | if (!non_pcm && per_pin->chmap_set) |
1134 | ca = hdmi_manual_channel_allocation(channels, per_pin->chmap); | 1136 | ca = hdmi_manual_channel_allocation(channels, per_pin->chmap); |
@@ -3330,6 +3332,7 @@ static const struct hda_codec_preset snd_hda_preset_hdmi[] = { | |||
3330 | { .id = 0x10de0051, .name = "GPU 51 HDMI/DP", .patch = patch_nvhdmi }, | 3332 | { .id = 0x10de0051, .name = "GPU 51 HDMI/DP", .patch = patch_nvhdmi }, |
3331 | { .id = 0x10de0060, .name = "GPU 60 HDMI/DP", .patch = patch_nvhdmi }, | 3333 | { .id = 0x10de0060, .name = "GPU 60 HDMI/DP", .patch = patch_nvhdmi }, |
3332 | { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi_2ch }, | 3334 | { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi_2ch }, |
3335 | { .id = 0x10de0071, .name = "GPU 71 HDMI/DP", .patch = patch_nvhdmi }, | ||
3333 | { .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi_2ch }, | 3336 | { .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi_2ch }, |
3334 | { .id = 0x11069f80, .name = "VX900 HDMI/DP", .patch = patch_via_hdmi }, | 3337 | { .id = 0x11069f80, .name = "VX900 HDMI/DP", .patch = patch_via_hdmi }, |
3335 | { .id = 0x11069f81, .name = "VX900 HDMI/DP", .patch = patch_via_hdmi }, | 3338 | { .id = 0x11069f81, .name = "VX900 HDMI/DP", .patch = patch_via_hdmi }, |
@@ -3385,6 +3388,7 @@ MODULE_ALIAS("snd-hda-codec-id:10de0044"); | |||
3385 | MODULE_ALIAS("snd-hda-codec-id:10de0051"); | 3388 | MODULE_ALIAS("snd-hda-codec-id:10de0051"); |
3386 | MODULE_ALIAS("snd-hda-codec-id:10de0060"); | 3389 | MODULE_ALIAS("snd-hda-codec-id:10de0060"); |
3387 | MODULE_ALIAS("snd-hda-codec-id:10de0067"); | 3390 | MODULE_ALIAS("snd-hda-codec-id:10de0067"); |
3391 | MODULE_ALIAS("snd-hda-codec-id:10de0071"); | ||
3388 | MODULE_ALIAS("snd-hda-codec-id:10de8001"); | 3392 | MODULE_ALIAS("snd-hda-codec-id:10de8001"); |
3389 | MODULE_ALIAS("snd-hda-codec-id:11069f80"); | 3393 | MODULE_ALIAS("snd-hda-codec-id:11069f80"); |
3390 | MODULE_ALIAS("snd-hda-codec-id:11069f81"); | 3394 | MODULE_ALIAS("snd-hda-codec-id:11069f81"); |