ALSA: hda: Correct dp audio infoframe

Was facing an issue with multi-ch audio over DP
because the channels fields (CC02_CT47) in the
dp_audio_infoframe struct was getting written into
AC_VERB_SET_HDMI_DIP_DATA verb at index 4 instead
of index 5. This caused wrong channel count to be
detected by the SOR/DP hardware.

Bug 200137880

Change-Id: I1bec75310dce0c26fd686cc9dab9938b38a8ac0a
Signed-off-by: Rahul Mittal <rmittal@nvidia.com>
Reviewed-on: http://git-master/r/804172
(cherry picked from commit 62d7cb125d7b986c0e663da29373b2d4c0860544)
Reviewed-on: http://git-master/r/806492
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Ravindra Lokhande <rlokhande@nvidia.com>

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index bf1c0346ded8ea112d4a1fd646b108bb4c209e2f..7d89bf506b7cad3d2eb663a97f6585aae7bc4caa 100644 (file)
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -4,7 +4,7 @@
  *
  *  Copyright(c) 2008-2010 Intel Corporation. All rights reserved.
  *  Copyright (c) 2006 ATI Technologies Inc.
- *  Copyright (c) 2008-2014, NVIDIA CORPORATION.  All rights reserved.
+ *  Copyright (c) 2008-2015, NVIDIA CORPORATION.  All rights reserved.
  *  Copyright (c) 2008 Wei Ni <wni@nvidia.com>
  *
  *  Authors:
@@ -120,7 +120,9 @@ struct dp_audio_infoframe {
        u8 type; /* 0x84 */
        u8 len;  /* 0x1b */
        u8 ver;  /* 0x11 << 2 */
-
+#ifdef CONFIG_SND_HDA_PLATFORM_NVIDIA_TEGRA
+       u8 checksum;
+#endif
        u8 CC02_CT47;   /* match with HDMI infoframe from this on */
        u8 SS01_SF24;
        u8 CXT04;