video: tegra: hdmi: hpd debounce work around

Few TVs are known to cause HPD debounce of 1 to 4 seconds.
This change tries to identify it and retain hdmi state for
such debounce for given TVs only.

bug 2051353

Change-Id: I3c126e15e3125bdcf8cccc1890de535855a17c48
Signed-off-by: Prafull Suryawanshi <prafulls@nvidia.com>
Signed-off-by: Aly Hirani <ahirani@nvidia.com>
(cherry picked from commit 31fe100d389713988df7d057ab39b6b2346aa542)
Reviewed-on: https://git-master.nvidia.com/r/1764674
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

5 files changed, 18 insertions, 5 deletions

diff --git a/drivers/video/tegra/dc/edid.c b/drivers/video/tegra/dc/edid.c
index ce1b225e5..e54d8e48c 100644
--- 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-2017, NVIDIA CORPORATION, All rights reserved.
+ * Copyright (c) 2010-2018, 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
@@ -690,7 +690,7 @@ u32 tegra_edid_get_quirks(struct tegra_edid *edid)
 {
         if (!edid || !edid->data) {
                 pr_warn("edid invalid\n");
-                return false;
+                return 0;
         }
 
         return edid->data->quirks;
diff --git a/drivers/video/tegra/dc/edid.h b/drivers/video/tegra/dc/edid.h
index dfe6f6696..100a4daa5 100644
--- a/drivers/video/tegra/dc/edid.h
+++ b/drivers/video/tegra/dc/edid.h
@@ -4,7 +4,7 @@
  * Copyright (C) 2010 Google, Inc.
  * Author: Erik Gilling <konkers@android.com>
  *
- * Copyright (c) 2011-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2011-2018, 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
@@ -140,6 +140,8 @@ enum {
 #define TEGRA_EDID_QUIRK_NO_HDCP    (1 << 2)
 /* Denon 2313 doesn't support YUV422, but declares support for it */
 #define TEGRA_EDID_QUIRK_NO_YUV_422     (1 << 3)
+/* TVs that send HPD bounce upto 4 seconds */
+#define TEGRA_EDID_QUIRK_HPD_BOUNCE (1 << 4)
 
 struct tegra_edid {
         struct tegra_edid_pvt   *data;
diff --git a/drivers/video/tegra/dc/edid_quirks.c b/drivers/video/tegra/dc/edid_quirks.c
index f755969bf..92d023331 100644
--- 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-2017, NVIDIA CORPORATION, All rights reserved.
+ * Copyright (c) 2015-2018, NVIDIA CORPORATION, All rights reserved.
  * Author: Anshuman Nath Kar <anshumank@nvidia.com>
  *
  * This software is licensed under the terms of the GNU General Public
@@ -33,6 +33,9 @@ static const struct hdmi_blacklist {
         { "BMD", 0,    "BMD HDMI",  TEGRA_EDID_QUIRK_NO_HDCP    },
         /* Denon 2313 doesn't support YUV422, but declares support for it */
         { "DON", 48, "DENON-AVR",   TEGRA_EDID_QUIRK_NO_YUV_422 },
+        /* Few TVs causing HPD bounce for 1-4 seconds */
+        { "YMH", 12774,"RX-A1070",  TEGRA_EDID_QUIRK_HPD_BOUNCE },
+        { "SAM", 3387, "SAMSUNG",   TEGRA_EDID_QUIRK_HPD_BOUNCE },
 };
 
 u32 tegra_edid_lookup_quirks(const char *manufacturer, u32 model,
diff --git a/drivers/video/tegra/dc/hdmi2.0.c b/drivers/video/tegra/dc/hdmi2.0.c
index 13c158738..283dc82e7 100644
--- a/drivers/video/tegra/dc/hdmi2.0.c
+++ b/drivers/video/tegra/dc/hdmi2.0.c
@@ -851,6 +851,7 @@ static irqreturn_t tegra_hdmi_hpd_irq_handler(int irq, void *ptr)
 {
         struct tegra_dc *dc = ptr;
         struct tegra_hdmi *hdmi = tegra_dc_get_outdata(dc);
+        unsigned int hpd_debounce = HDMI_HPD_DEBOUNCE_DELAY_MS;
 
         if (dc->out->type == TEGRA_DC_OUT_FAKE_DP)
                 return IRQ_HANDLED;
@@ -859,8 +860,14 @@ static irqreturn_t tegra_hdmi_hpd_irq_handler(int irq, void *ptr)
                 return IRQ_HANDLED;
 
         cancel_delayed_work(&hdmi->hpd_worker);
+
+        if (tegra_edid_get_quirks(hdmi->edid) &
+                        TEGRA_EDID_QUIRK_HPD_BOUNCE) {
+                hpd_debounce = HDMI_HPD_DEBOUNCE_WAR_DELAY_MS;
+        }
+
         schedule_delayed_work(&hdmi->hpd_worker,
-                                msecs_to_jiffies(HDMI_HPD_DEBOUNCE_DELAY_MS));
+                                msecs_to_jiffies(hpd_debounce));
 
         return IRQ_HANDLED;
 }
diff --git a/drivers/video/tegra/dc/hdmi2.0.h b/drivers/video/tegra/dc/hdmi2.0.h
index 538cb474f..3f9f2115a 100644
--- a/drivers/video/tegra/dc/hdmi2.0.h
+++ b/drivers/video/tegra/dc/hdmi2.0.h
@@ -23,6 +23,7 @@
 #define HDMI_SCDC_MONITOR_TIMEOUT_MS    (5000)
 #define HDMI_EDID_MAX_LENGTH (4 * EDID_BYTES_PER_BLOCK)
 #define HDMI_HDR_INFOFRAME_STOP_TIMEOUT_MS      (2000)
+#define HDMI_HPD_DEBOUNCE_WAR_DELAY_MS  (4000)
 
 /* SCDC block */
 #define HDMI_SCDC_TMDS_CONFIG_OFFSET    (0x20)