gpu: nvgpu: Increase PBDMA timeout

[sojka/nv-tegra/linux-3.10.git] / drivers / gpu / nvgpu / gk20a / fifo_gk20a.c

diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index a5174b4a30bc0f06da1deb8df05c1b7b559f0b3f..c1a04ce4f078020e096afebbbda25488abbf547f 100644 (file)
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -417,6 +417,13 @@ int gk20a_init_fifo_reset_enable_hw(struct gk20a *g)
                        fifo_fb_timeout_period_max_f());
        gk20a_writel(g, fifo_fb_timeout_r(), timeout);
 
+       for (i = 0; i < pbdma_timeout__size_1_v(); i++) {
+               timeout = gk20a_readl(g, pbdma_timeout_r(i));
+               timeout = set_field(timeout, pbdma_timeout_period_m(),
+                                   pbdma_timeout_period_max_f());
+               gk20a_writel(g, pbdma_timeout_r(i), timeout);
+       }
+
        if (tegra_platform_is_silicon()) {
                timeout = gk20a_readl(g, fifo_pb_timeout_r());
                timeout &= ~fifo_pb_timeout_detection_enabled_f();