From 493d0c8af3069745dd800ce9e093f8359a1fb851 Mon Sep 17 00:00:00 2001 From: Vijayakumar Date: Mon, 5 Mar 2018 10:15:34 +0530 Subject: gpu: nvgpu: gv100: set apply_ctxsw_timeout and ch_wdt_timeout_ms -set apply_ctxsw_timeout_intr to NULL. This was added as part of DNI change SHA 1f71f475e25fe786ec76d76a986aac8afec51b01 -change ch_wdt_timeout_ms from 30ms to 7ms Bug 2040544 Bug 2069807 Change-Id: I9125207146e1e3e42325ecda6a2aa7f1c07fdd3a Signed-off-by: Seema Khowala Reviewed-on: https://git-master.nvidia.com/r/1683719 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/pci.c | 5 +---- drivers/gpu/nvgpu/gv100/hal_gv100.c | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'drivers') 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, -- cgit v1.2.2