diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-04-10 13:47:02 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-13 16:44:41 -0400 |
commit | 22426a5452ba943ac48867722fb0927baf66d4ac (patch) | |
tree | 4595c635cc920e4ba2d540a6e070b89e3037c28e /drivers/gpu/nvgpu/gk20a/fb_gk20a.c | |
parent | a0fa2b0258dafcd7a2450ab5366a49663b1d2e89 (diff) |
gpu: nvgpu: gk20a: Use new delay APIs
Use platform agnostic delay functions instead of Linux kernel APIs.
This allows removing dependency to Linux header linux/delay.h. At the
same time remove #include lines for other unused Linux headers.
JIRA NVGPU-16
Change-Id: I46b9ccb80e0b67efb86ec85676e5a55ff835c0ec
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1460113
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fb_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fb_gk20a.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c index b3c52852..214014ce 100644 --- a/drivers/gpu/nvgpu/gk20a/fb_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fb_gk20a.c | |||
@@ -14,12 +14,13 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <trace/events/gk20a.h> | 16 | #include <trace/events/gk20a.h> |
17 | #include <linux/delay.h> | ||
18 | 17 | ||
19 | #include "gk20a.h" | 18 | #include "gk20a.h" |
20 | #include "kind_gk20a.h" | 19 | #include "kind_gk20a.h" |
21 | #include "fb_gk20a.h" | 20 | #include "fb_gk20a.h" |
22 | 21 | ||
22 | #include <nvgpu/timers.h> | ||
23 | |||
23 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> | 24 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> |
24 | #include <nvgpu/hw/gk20a/hw_fb_gk20a.h> | 25 | #include <nvgpu/hw/gk20a/hw_fb_gk20a.h> |
25 | 26 | ||
@@ -124,7 +125,7 @@ void gk20a_fb_tlb_invalidate(struct gk20a *g, struct nvgpu_mem *pdb) | |||
124 | data = gk20a_readl(g, fb_mmu_ctrl_r()); | 125 | data = gk20a_readl(g, fb_mmu_ctrl_r()); |
125 | if (fb_mmu_ctrl_pri_fifo_space_v(data) != 0) | 126 | if (fb_mmu_ctrl_pri_fifo_space_v(data) != 0) |
126 | break; | 127 | break; |
127 | udelay(2); | 128 | nvgpu_udelay(2); |
128 | } while (!nvgpu_timeout_expired_msg(&timeout, | 129 | } while (!nvgpu_timeout_expired_msg(&timeout, |
129 | "wait mmu fifo space")); | 130 | "wait mmu fifo space")); |
130 | 131 | ||
@@ -148,7 +149,7 @@ void gk20a_fb_tlb_invalidate(struct gk20a *g, struct nvgpu_mem *pdb) | |||
148 | if (fb_mmu_ctrl_pri_fifo_empty_v(data) != | 149 | if (fb_mmu_ctrl_pri_fifo_empty_v(data) != |
149 | fb_mmu_ctrl_pri_fifo_empty_false_f()) | 150 | fb_mmu_ctrl_pri_fifo_empty_false_f()) |
150 | break; | 151 | break; |
151 | udelay(2); | 152 | nvgpu_udelay(2); |
152 | } while (!nvgpu_timeout_expired_msg(&timeout, | 153 | } while (!nvgpu_timeout_expired_msg(&timeout, |
153 | "wait mmu invalidate")); | 154 | "wait mmu invalidate")); |
154 | 155 | ||