4 files changed, 14 insertions, 2 deletions

diff --git a/drivers/video/tegra/dc/dc.h b/drivers/video/tegra/dc/dc.h
index 2952d6e73..4ec62158a 100644
--- a/drivers/video/tegra/dc/dc.h
+++ b/drivers/video/tegra/dc/dc.h
@@ -637,6 +637,7 @@ struct tegra_dc_out {
         int                             hotplug_gpio;
         int                             hotplug_state; /* TEGRA_HPD_STATE_* */
         int                             vrr_hotplug_state;
+        int                             prev_hotplug_state;
         const char                      *parent_clk;
 
         unsigned                        max_pixclock;
diff --git a/drivers/video/tegra/dc/hdcp/hdmihdcp.c b/drivers/video/tegra/dc/hdcp/hdmihdcp.c
index bcd07bbbc..619cd84d0 100644
--- a/drivers/video/tegra/dc/hdcp/hdmihdcp.c
+++ b/drivers/video/tegra/dc/hdcp/hdmihdcp.c
@@ -1435,6 +1435,11 @@ exit:
         return err;
 }
 
+void tegra_nvhdcp_clear_fallback(struct tegra_nvhdcp *nvhdcp)
+{
+        g_fallback = 0;
+}
+
 static void nvhdcp_fallback_worker(struct work_struct *work)
 {
         struct tegra_nvhdcp *nvhdcp =
@@ -1490,7 +1495,6 @@ static void nvhdcp_downstream_worker(struct work_struct *work)
                 }
         }
 
-        g_fallback = 0;
 
         nvhdcp_vdbg("%s():started thread %s for sor: %x\n", __func__,
                         nvhdcp->name, nvhdcp->hdmi->sor->ctrl_num);
diff --git a/drivers/video/tegra/dc/hdcp/hdmihdcp.h b/drivers/video/tegra/dc/hdcp/hdmihdcp.h
index b9be41df9..7bc7d9973 100644
--- a/drivers/video/tegra/dc/hdcp/hdmihdcp.h
+++ b/drivers/video/tegra/dc/hdcp/hdmihdcp.h
@@ -78,6 +78,7 @@ struct tegra_nvhdcp {
 
 #ifdef CONFIG_HDCP
 void tegra_nvhdcp_set_plug(struct tegra_nvhdcp *nvhdcp, bool hpd);
+void tegra_nvhdcp_clear_fallback(struct tegra_nvhdcp *nvhdcp);
 int tegra_nvhdcp_set_policy(struct tegra_nvhdcp *nvhdcp, int pol);
 void tegra_nvhdcp_suspend(struct tegra_nvhdcp *nvhdcp);
 void tegra_nvhdcp_resume(struct tegra_nvhdcp *nvhdcp);
@@ -100,6 +101,7 @@ static inline int tegra_nvhdcp_set_policy(struct tegra_nvhdcp *nvhdcp, int pol)
 {
         return 0;
 }
+void tegra_nvhdcp_clear_fallback(struct tegra_nvhdcp *nvhdcp) { }
 static inline void tegra_nvhdcp_suspend(struct tegra_nvhdcp *nvhdcp) { }
 static inline void tegra_nvhdcp_resume(struct tegra_nvhdcp *nvhdcp) { }
 static inline void tegra_nvhdcp_shutdown(struct tegra_nvhdcp *nvhdcp) { }
diff --git a/drivers/video/tegra/dc/hdmi2.0.c b/drivers/video/tegra/dc/hdmi2.0.c
index ad2a0d4b3..a26619515 100644
--- a/drivers/video/tegra/dc/hdmi2.0.c
+++ b/drivers/video/tegra/dc/hdmi2.0.c
@@ -787,6 +787,10 @@ static void tegra_hdmi_hpd_worker(struct work_struct *work)
         connected = tegra_dc_hpd(hdmi->dc);
         orig_state = hdmi->plug_state;
 
+        if (hdmi->dc->out->hotplug_state == TEGRA_HPD_STATE_NORMAL &&
+                hdmi->dc->out->prev_hotplug_state == TEGRA_HPD_STATE_NORMAL)
+                        tegra_nvhdcp_clear_fallback(hdmi->nvhdcp);
+
         if (connected) {
                 switch (orig_state) {
                 case TEGRA_HDMI_MONITOR_ENABLE:
@@ -859,6 +863,7 @@ static irqreturn_t tegra_hdmi_hpd_irq_handler(int irq, void *ptr)
         if (atomic_read(&hdmi->suspended))
                 return IRQ_HANDLED;
 
+        tegra_nvhdcp_clear_fallback(hdmi->nvhdcp);
         cancel_delayed_work(&hdmi->hpd_worker);
 
         if (tegra_edid_get_quirks(hdmi->edid) &
@@ -3376,6 +3381,7 @@ void tegra_hdmi_set_hotplug_state(struct tegra_hdmi *hdmi, int new_hpd_state)
 
         rmb();
         hotplug_state = dc->out->hotplug_state;
+        dc->out->prev_hotplug_state = hotplug_state;
 
         if (hotplug_state == TEGRA_HPD_STATE_NORMAL &&
                         new_hpd_state != TEGRA_HPD_STATE_NORMAL &&
@@ -3389,7 +3395,6 @@ void tegra_hdmi_set_hotplug_state(struct tegra_hdmi *hdmi, int new_hpd_state)
 
         dc->out->hotplug_state = new_hpd_state;
         wmb();
-
         /*
          * sw controlled plug/unplug.
          * wait for any already executing hpd worker thread.