diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-03-29 18:00:24 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-11 13:56:06 -0400 |
commit | 19fdb429c2b04d13faecad8b2e5466e9f3c7b8c7 (patch) | |
tree | e92f6d93ae2593286546f983b9a1fff8638aa9a6 /drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |
parent | 1a4647272f4fe50137c79583b698c1ef6f5def12 (diff) |
gpu: nvgpu: Wrappers for checking platform type
Add nvgpu_* wrappers for determining if we're running in simulation
or silicon, and if we're running in hypervisor.
The new wrappers require struct gk20a pointer, and gk20a_fence_wait()
did not have access to one. Add struct gk20a pointer as the first
parameter.
JIRA NVGPU-16
Change-Id: I73b2b8f091ca29fb1827054abd2adaf583710331
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1331565
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index c7db67fe..bdd068fe 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <nvgpu/semaphore.h> | 31 | #include <nvgpu/semaphore.h> |
32 | #include <nvgpu/kmem.h> | 32 | #include <nvgpu/kmem.h> |
33 | #include <nvgpu/log.h> | 33 | #include <nvgpu/log.h> |
34 | #include <nvgpu/soc.h> | ||
34 | 35 | ||
35 | #include "gk20a.h" | 36 | #include "gk20a.h" |
36 | #include "debug_gk20a.h" | 37 | #include "debug_gk20a.h" |
@@ -3349,7 +3350,7 @@ static void gk20a_fifo_apply_pb_timeout(struct gk20a *g) | |||
3349 | { | 3350 | { |
3350 | u32 timeout; | 3351 | u32 timeout; |
3351 | 3352 | ||
3352 | if (tegra_platform_is_silicon()) { | 3353 | if (nvgpu_platform_is_silicon(g)) { |
3353 | timeout = gk20a_readl(g, fifo_pb_timeout_r()); | 3354 | timeout = gk20a_readl(g, fifo_pb_timeout_r()); |
3354 | timeout &= ~fifo_pb_timeout_detection_enabled_f(); | 3355 | timeout &= ~fifo_pb_timeout_detection_enabled_f(); |
3355 | gk20a_writel(g, fifo_pb_timeout_r(), timeout); | 3356 | gk20a_writel(g, fifo_pb_timeout_r(), timeout); |