diff options
author | Vijayakumar <vsubbu@nvidia.com> | 2018-03-04 23:45:34 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-03-30 17:54:21 -0400 |
commit | 493d0c8af3069745dd800ce9e093f8359a1fb851 (patch) | |
tree | 4009e99859a59cfd0b0e6f35e6840bc81caefbc9 /drivers/gpu/nvgpu | |
parent | 29df4f3da6232e9e3e8916d7b6d7587af7f92360 (diff) |
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 <seemaj@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1683719
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/pci.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv100/hal_gv100.c | 1 |
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[] = { | |||
342 | .is_railgated = nvgpu_pci_tegra_is_railgated, | 342 | .is_railgated = nvgpu_pci_tegra_is_railgated, |
343 | .clk_round_rate = nvgpu_pci_clk_round_rate, | 343 | .clk_round_rate = nvgpu_pci_clk_round_rate, |
344 | 344 | ||
345 | /* | 345 | .ch_wdt_timeout_ms = 7000, |
346 | * WAR: PCIE X1 is very slow, set to very high value till nvlink is up | ||
347 | */ | ||
348 | .ch_wdt_timeout_ms = 30000, | ||
349 | 346 | ||
350 | .honors_aperture = true, | 347 | .honors_aperture = true, |
351 | .vbios_min_version = 0x1, | 348 | .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 = { | |||
534 | .device_info_fault_id = top_device_info_data_fault_id_enum_v, | 534 | .device_info_fault_id = top_device_info_data_fault_id_enum_v, |
535 | .free_channel_ctx_header = gv11b_free_subctx_header, | 535 | .free_channel_ctx_header = gv11b_free_subctx_header, |
536 | .preempt_ch_tsg = gv11b_fifo_preempt_ch_tsg, | 536 | .preempt_ch_tsg = gv11b_fifo_preempt_ch_tsg, |
537 | .apply_ctxsw_timeout_intr = gv100_apply_ctxsw_timeout_intr, | ||
538 | }, | 537 | }, |
539 | .gr_ctx = { | 538 | .gr_ctx = { |
540 | .get_netlist_name = gr_gv100_get_netlist_name, | 539 | .get_netlist_name = gr_gv100_get_netlist_name, |