diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index 4e08ffea..c296be5b 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -17,10 +17,7 @@ | |||
17 | * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. | 17 | * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/delay.h> | ||
21 | #include <linux/scatterlist.h> | ||
22 | #include <trace/events/gk20a.h> | 20 | #include <trace/events/gk20a.h> |
23 | #include <linux/dma-mapping.h> | ||
24 | #ifdef CONFIG_TEGRA_GK20A_NVHOST | 21 | #ifdef CONFIG_TEGRA_GK20A_NVHOST |
25 | #include <linux/nvhost.h> | 22 | #include <linux/nvhost.h> |
26 | #endif | 23 | #endif |
@@ -1735,7 +1732,7 @@ static void gk20a_fifo_trigger_mmu_fault(struct gk20a *g, | |||
1735 | fifo_intr_0_mmu_fault_pending_f()) | 1732 | fifo_intr_0_mmu_fault_pending_f()) |
1736 | break; | 1733 | break; |
1737 | 1734 | ||
1738 | usleep_range(delay, delay * 2); | 1735 | nvgpu_usleep_range(delay, delay * 2); |
1739 | delay = min_t(u32, delay << 1, GR_IDLE_CHECK_MAX); | 1736 | delay = min_t(u32, delay << 1, GR_IDLE_CHECK_MAX); |
1740 | } while (!nvgpu_timeout_expired_msg(&timeout, "mmu fault timeout")); | 1737 | } while (!nvgpu_timeout_expired_msg(&timeout, "mmu fault timeout")); |
1741 | 1738 | ||
@@ -2533,7 +2530,7 @@ int gk20a_fifo_is_preempt_pending(struct gk20a *g, u32 id, | |||
2533 | break; | 2530 | break; |
2534 | } | 2531 | } |
2535 | 2532 | ||
2536 | usleep_range(delay, delay * 2); | 2533 | nvgpu_usleep_range(delay, delay * 2); |
2537 | delay = min_t(u32, delay << 1, GR_IDLE_CHECK_MAX); | 2534 | delay = min_t(u32, delay << 1, GR_IDLE_CHECK_MAX); |
2538 | } while (!nvgpu_timeout_expired_msg(&timeout, "preempt timeout")); | 2535 | } while (!nvgpu_timeout_expired_msg(&timeout, "preempt timeout")); |
2539 | 2536 | ||
@@ -2901,7 +2898,7 @@ static int gk20a_fifo_runlist_wait_pending(struct gk20a *g, u32 runlist_id) | |||
2901 | break; | 2898 | break; |
2902 | } | 2899 | } |
2903 | 2900 | ||
2904 | usleep_range(delay, delay * 2); | 2901 | nvgpu_usleep_range(delay, delay * 2); |
2905 | delay = min_t(u32, delay << 1, GR_IDLE_CHECK_MAX); | 2902 | delay = min_t(u32, delay << 1, GR_IDLE_CHECK_MAX); |
2906 | } while (!nvgpu_timeout_expired(&timeout)); | 2903 | } while (!nvgpu_timeout_expired(&timeout)); |
2907 | 2904 | ||
@@ -3348,7 +3345,7 @@ int gk20a_fifo_wait_engine_idle(struct gk20a *g) | |||
3348 | break; | 3345 | break; |
3349 | } | 3346 | } |
3350 | 3347 | ||
3351 | usleep_range(delay, delay * 2); | 3348 | nvgpu_usleep_range(delay, delay * 2); |
3352 | delay = min_t(unsigned long, | 3349 | delay = min_t(unsigned long, |
3353 | delay << 1, GR_IDLE_CHECK_MAX); | 3350 | delay << 1, GR_IDLE_CHECK_MAX); |
3354 | } while (!nvgpu_timeout_expired(&timeout)); | 3351 | } while (!nvgpu_timeout_expired(&timeout)); |