tegra: dc: HDCP delay quirk for LG soundbar

LG soundbar have HDCP delay issue where after sleep-resume, initially hdcp is unstable causing fallback to HDCP1.4 from HDCP2.2. So fix it adding its edid to HDCP delay quirk which already takes care of this scenario on some TVs. Bug 3323188 Change-Id: I172924fcc353e9e20056b0ac9b258eaeef2982fd Signed-off-by: Prafull Suryawanshi <prafulls@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2550647 (cherry picked from commit ba2288d315d905bbea308723c1d3668aaa8a0fd4) Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2552301 Reviewed-by: svcacv <svcacv@nvidia.com> Reviewed-by: svc_kernel_abi <svc_kernel_abi@nvidia.com> Reviewed-by: Ujwal Patel <ujwalp@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com> GVS: Gerrit_Virtual_Submit
OE4T · Jul 6, 2021 · 6d05372 · 6d05372
1 parent 580eb48
commit 6d05372
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/drivers/video/tegra/dc/edid.c b/drivers/video/tegra/dc/edid.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2010 Google, Inc.
  * Author: Erik Gilling <konkers@android.com>
  *
- * Copyright (c) 2010-2020, NVIDIA CORPORATION, All rights reserved.
+ * Copyright (c) 2010-2021, NVIDIA CORPORATION, All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -1112,7 +1112,7 @@ int tegra_edid_get_monspecs(struct tegra_edid *edid, struct fb_monspecs *specs)
 				data[i * EDID_BYTES_PER_BLOCK + 2],
 				new_data);
 
-			if (new_data->quirks == TEGRA_EDID_QUIRK_LG_SBAR)
+			if (new_data->quirks | TEGRA_EDID_QUIRK_LG_SBAR)
 				tegra_edid_quirk_lg_sbar(new_data, specs);
 
 			if (new_data->support_stereo) {

diff --git a/drivers/video/tegra/dc/edid_quirks.c b/drivers/video/tegra/dc/edid_quirks.c
@@ -1,7 +1,7 @@
 /*
  * edid_quirks.c: edid specific exceptions.
  *
- * Copyright (c) 2015-2020, NVIDIA CORPORATION, All rights reserved.
+ * Copyright (c) 2015-2021, NVIDIA CORPORATION, All rights reserved.
  * Author: Anshuman Nath Kar <anshumank@nvidia.com>
  *
  * This software is licensed under the terms of the GNU General Public
@@ -47,7 +47,9 @@ static const struct hdmi_blacklist {
 	/* WAR for bug 2408317 to skip non-CEA modes */
 	{ "KL@", 18508, "LCD HDTV", TEGRA_EDID_QUIRK_ONLY_CEA   },
 	/* WAR for bug 2818605 to add missing DV 4k@60 */
-	{ "LGE", 0,    "LG-SBAR",   TEGRA_EDID_QUIRK_LG_SBAR    },
+	/* WAR for bug 3323188 to fix HDCP delay issue on LG SBAR */
+	{ "LGE", 0,    "LG-SBAR",   TEGRA_EDID_QUIRK_LG_SBAR |
+		TEGRA_EDID_QUIRK_DELAY_HDCP },
 	/* WAR for bug 2789334 to fix Dolby Vision VSVDB length */
 	{ "VIZ", 4149, "M558-G1",   TEGRA_EDID_QUIRK_VSVDB_LEN  },
 };