Revert "gpu: nvgpu: enable semaphore acquire 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 0999304ea94b90b70b7ef22cc85ede393f136915..7bd98f57d763d1ce89f42338c47680b40fcd0249 100644 (file)
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -1617,12 +1617,6 @@ static u32 gk20a_fifo_handle_pbdma_intr(struct device *dev,
                                    pbdma_intr_0);
                }
 
-               if (pbdma_intr_0 & pbdma_intr_0_acquire_pending_f()) {
-                       u32 val = gk20a_readl(g, pbdma_acquire_r(pbdma_id));
-                       val &= ~pbdma_acquire_timeout_en_enable_f();
-                       gk20a_writel(g, pbdma_acquire_r(pbdma_id), val);
-               }
-
                if (pbdma_intr_0 & pbdma_intr_0_pbentry_pending_f()) {
                        gk20a_fifo_reset_pbdma_header(g, pbdma_id);
                        gk20a_fifo_reset_pbdma_method(g, pbdma_id, 0);