summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScottPeterson <speterson@nvidia.com>2011-07-20 13:29:10 -0700
committerNiket Sirsi <nsirsi@nvidia.com>2011-07-21 18:09:33 -0700
commit13bbb59bfe687944923bceb1b2f60020546ce082 (patch)
tree79988c581dbe2ce6dc05aaa4c0fd01e16d005412
parent0cc838ae44178627dfae295487c335055d8dd244 (diff)
video: tegra: dc: Add basic audio EDID
Add support so that when the EDID is read from an HDMI display we set the spk_alloc flag to Left+Right, even if the optional SPeaker Allocation Block is not present. This provides a default audio configuration. Bug 849686 Change-Id: I549bfb356ba594f7b38baec0f4e5f18ac91602c0 Reviewed-on: http://git-master/r/42173 Reviewed-by: Niket Sirsi <nsirsi@nvidia.com> Tested-by: Niket Sirsi <nsirsi@nvidia.com>
-rw-r--r--drivers/video/tegra/dc/edid.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/video/tegra/dc/edid.c b/drivers/video/tegra/dc/edid.c
index d3e5d0898162..559d4a1d2b03 100644
--- a/drivers/video/tegra/dc/edid.c
+++ b/drivers/video/tegra/dc/edid.c
@@ -178,6 +178,14 @@ int tegra_edid_parse_ext_block(u8 *raw, int idx, struct tegra_edid *edid)
if (*ptr <= 3)
edid->eld.eld_ver = 0x02;
edid->eld.cea_edid_ver = ptr[1];
+
+ /* check for basic audio support in CEA 861 block */
+ if(raw[3] & (1<<6)) {
+ /* For basic audio, set spk_alloc to Left+Right.
+ * If there is a Speaker Alloc block this will
+ * get over written with that value */
+ edid->eld.spk_alloc = 1;
+ }
}
ptr = &raw[4];