2 files changed, 1 insertions, 41 deletions

diff --git a/drivers/video/tegra/host/host1x/hw_host1x6_sync.h b/drivers/video/tegra/host/host1x/hw_host1x6_sync.h
index 2a217dd87..a87ba840c 100644
--- a/drivers/video/tegra/host/host1x/hw_host1x6_sync.h
+++ b/drivers/video/tegra/host/host1x/hw_host1x6_sync.h
@@ -50,8 +50,6 @@
 #ifndef _hw_host1x6_sync_h_
 #define _hw_host1x6_sync_h_
 
-extern bool use_vm_threshold_registers;
-
 static inline u32 host1x_sync_intstatus_r(void)
 {
         return 0x1c;
@@ -250,10 +248,7 @@ static inline u32 host1x_sync_syncpt_0_r(void)
 }
 static inline u32 host1x_sync_syncpt_int_thresh_0_r(void)
 {
-        if (use_vm_threshold_registers)
-                return 0x9980;
-
-        return 0x8d00;
+        return 0x9980;
 }
 static inline u32 host1x_sync_syncpt_prot_en_0_r(void)
 {
diff --git a/drivers/video/tegra/host/t194/t194.c b/drivers/video/tegra/host/t194/t194.c
index 7ebbaaf5f..9f422ba2c 100644
--- a/drivers/video/tegra/host/t194/t194.c
+++ b/drivers/video/tegra/host/t194/t194.c
@@ -708,39 +708,6 @@ static void t194_remove_support(struct nvhost_chip_support *op)
         op->priv = NULL;
 }
 
-bool use_vm_threshold_registers;
-
-static void init_syncpt_thresh_reg(struct nvhost_master *host)
-{
-        unsigned int id = host->info.pts_base;
-        unsigned long val;
-
-        /*
-         * WAR to bug 200293149: Check which threshold range
-         * should be used. By default we use the old register
-         * range for setting the interrupts. If the
-         * model doesn't support the old range, it will assert
-         * the interrupt immediately. If this happens, the code
-         * flags that we should use the VM threshold ranges
-         * instead.
-         */
-
-        intr_op().disable_all_syncpt_intrs(&host->intr);
-        intr_op().set_syncpt_threshold(&host->intr, id, 1);
-        intr_op().enable_syncpt_intr(&host->intr, id);
-
-        udelay(10);
-
-        val = host1x_readl(host->dev,
-                        host1x_sync_syncpt_thresh_cpu0_int_status_r() +
-                        bit_word(id) * 4);
-
-        if (val & bit_mask(id))
-                use_vm_threshold_registers = true;
-
-        intr_op().disable_all_syncpt_intrs(&host->intr);
-}
-
 #define SYNCPT_RAM_INIT_TIMEOUT_MS      1000
 
 static void t194_init_regs(struct platform_device *pdev, bool prod)
@@ -778,8 +745,6 @@ static void t194_init_regs(struct platform_device *pdev, bool prod)
                 }
         }
 
-        init_syncpt_thresh_reg(nvhost_get_host(pdev));
-
         /* Use old mapping registers on older simulator CLs */
         ret = of_property_read_u64(pdev->dev.of_node,
                                    "nvidia,changelist",