summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/bus/bus_gk20a.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/common/bus/bus_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/common/bus/bus_gk20a.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/drivers/gpu/nvgpu/common/bus/bus_gk20a.c b/drivers/gpu/nvgpu/common/bus/bus_gk20a.c
index d173123d..9f0446c6 100644
--- a/drivers/gpu/nvgpu/common/bus/bus_gk20a.c
+++ b/drivers/gpu/nvgpu/common/bus/bus_gk20a.c
@@ -32,29 +32,14 @@
32 32
33void gk20a_bus_init_hw(struct gk20a *g) 33void gk20a_bus_init_hw(struct gk20a *g)
34{ 34{
35 u32 timeout_period, intr_en_mask = 0; 35 u32 intr_en_mask = 0;
36
37 if (nvgpu_platform_is_silicon(g))
38 timeout_period = g->default_pri_timeout ?
39 g->default_pri_timeout : 0x186A0;
40 else
41 timeout_period = 0x186A0;
42 36
43 if (nvgpu_platform_is_silicon(g) || nvgpu_platform_is_fpga(g)) { 37 if (nvgpu_platform_is_silicon(g) || nvgpu_platform_is_fpga(g)) {
44 intr_en_mask = bus_intr_en_0_pri_squash_m() | 38 intr_en_mask = bus_intr_en_0_pri_squash_m() |
45 bus_intr_en_0_pri_fecserr_m() | 39 bus_intr_en_0_pri_fecserr_m() |
46 bus_intr_en_0_pri_timeout_m(); 40 bus_intr_en_0_pri_timeout_m();
47 gk20a_writel(g,
48 timer_pri_timeout_r(),
49 timer_pri_timeout_period_f(timeout_period) |
50 timer_pri_timeout_en_en_enabled_f());
51
52 } else {
53 gk20a_writel(g,
54 timer_pri_timeout_r(),
55 timer_pri_timeout_period_f(timeout_period) |
56 timer_pri_timeout_en_en_disabled_f());
57 } 41 }
42
58 gk20a_writel(g, bus_intr_en_0_r(), intr_en_mask); 43 gk20a_writel(g, bus_intr_en_0_r(), intr_en_mask);
59} 44}
60 45