2 files changed, 1 insertions, 5 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/pci.c b/drivers/gpu/nvgpu/common/linux/pci.c
index 3ea4357f..fe4c0f09 100644
--- a/drivers/gpu/nvgpu/common/linux/pci.c
+++ b/drivers/gpu/nvgpu/common/linux/pci.c
@@ -342,10 +342,7 @@ static struct gk20a_platform nvgpu_pci_device[] = {
         .is_railgated = nvgpu_pci_tegra_is_railgated,
         .clk_round_rate = nvgpu_pci_clk_round_rate,
 
-        /*
-         * WAR: PCIE X1 is very slow, set to very high value till nvlink is up
-         */
-        .ch_wdt_timeout_ms = 30000,
+        .ch_wdt_timeout_ms = 7000,
 
         .honors_aperture = true,
         .vbios_min_version = 0x1,
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c
index 0dcfb064..f0187dab 100644
--- a/drivers/gpu/nvgpu/gv100/hal_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c
@@ -534,7 +534,6 @@ static const struct gpu_ops gv100_ops = {
                 .device_info_fault_id = top_device_info_data_fault_id_enum_v,
                 .free_channel_ctx_header = gv11b_free_subctx_header,
                 .preempt_ch_tsg = gv11b_fifo_preempt_ch_tsg,
-                .apply_ctxsw_timeout_intr = gv100_apply_ctxsw_timeout_intr,
         },
         .gr_ctx = {
                 .get_netlist_name = gr_gv100_get_netlist_name,