diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fence_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fence_gk20a.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c index 115cd2b5..ea3cd3ff 100644 --- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "../drivers/staging/android/sync.h" | 27 | #include "../drivers/staging/android/sync.h" |
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | #ifdef CONFIG_TEGRA_GK20A | 30 | #ifdef CONFIG_TEGRA_GK20A_NVHOST |
31 | #include <linux/nvhost.h> | 31 | #include <linux/nvhost.h> |
32 | #include <linux/nvhost_ioctl.h> | 32 | #include <linux/nvhost_ioctl.h> |
33 | #endif | 33 | #endif |
@@ -262,7 +262,7 @@ int gk20a_fence_from_semaphore( | |||
262 | return 0; | 262 | return 0; |
263 | } | 263 | } |
264 | 264 | ||
265 | #ifdef CONFIG_TEGRA_GK20A | 265 | #ifdef CONFIG_TEGRA_GK20A_NVHOST |
266 | /* Fences that are backed by host1x syncpoints: */ | 266 | /* Fences that are backed by host1x syncpoints: */ |
267 | 267 | ||
268 | static int gk20a_syncpt_fence_wait(struct gk20a_fence *f, long timeout) | 268 | static int gk20a_syncpt_fence_wait(struct gk20a_fence *f, long timeout) |
@@ -341,8 +341,11 @@ int gk20a_fence_from_syncpt( | |||
341 | return 0; | 341 | return 0; |
342 | } | 342 | } |
343 | #else | 343 | #else |
344 | int gk20a_fence_from_syncpt(struct platform_device *host1x_pdev, | 344 | int gk20a_fence_from_syncpt( |
345 | u32 id, u32 value, bool wfi) | 345 | struct gk20a_fence *fence_out, |
346 | struct platform_device *host1x_pdev, | ||
347 | u32 id, u32 value, bool wfi, | ||
348 | bool need_sync_fence) | ||
346 | { | 349 | { |
347 | return -EINVAL; | 350 | return -EINVAL; |
348 | } | 351 | } |