diff options
Diffstat (limited to 'drivers/gpu/nvgpu/os/linux')
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_channel.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_channel.c b/drivers/gpu/nvgpu/os/linux/ioctl_channel.c index e9a24923..0f6843df 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl_channel.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_channel.c | |||
@@ -35,11 +35,11 @@ | |||
35 | #include <nvgpu/nvhost.h> | 35 | #include <nvgpu/nvhost.h> |
36 | #include <nvgpu/os_sched.h> | 36 | #include <nvgpu/os_sched.h> |
37 | #include <nvgpu/channel.h> | 37 | #include <nvgpu/channel.h> |
38 | #include <nvgpu/channel_sync.h> | ||
38 | 39 | ||
39 | #include "gk20a/gk20a.h" | 40 | #include "gk20a/gk20a.h" |
40 | #include "gk20a/dbg_gpu_gk20a.h" | 41 | #include "gk20a/dbg_gpu_gk20a.h" |
41 | #include "gk20a/fence_gk20a.h" | 42 | #include "gk20a/fence_gk20a.h" |
42 | #include "gk20a/channel_sync_gk20a.h" | ||
43 | 43 | ||
44 | #include "platform_gk20a.h" | 44 | #include "platform_gk20a.h" |
45 | #include "ioctl_channel.h" | 45 | #include "ioctl_channel.h" |
@@ -1028,7 +1028,7 @@ static int nvgpu_ioctl_channel_get_user_syncpoint(struct channel_gk20a *ch, | |||
1028 | if (ch->user_sync) { | 1028 | if (ch->user_sync) { |
1029 | nvgpu_mutex_release(&ch->sync_lock); | 1029 | nvgpu_mutex_release(&ch->sync_lock); |
1030 | } else { | 1030 | } else { |
1031 | ch->user_sync = gk20a_channel_sync_create(ch, true); | 1031 | ch->user_sync = nvgpu_channel_sync_create(ch, true); |
1032 | if (!ch->user_sync) { | 1032 | if (!ch->user_sync) { |
1033 | nvgpu_mutex_release(&ch->sync_lock); | 1033 | nvgpu_mutex_release(&ch->sync_lock); |
1034 | return -ENOMEM; | 1034 | return -ENOMEM; |
diff --git a/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c b/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c index ec3ccf0d..195da64a 100644 --- a/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c +++ b/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c | |||
@@ -21,8 +21,8 @@ | |||
21 | #include <nvgpu/linux/os_fence_android.h> | 21 | #include <nvgpu/linux/os_fence_android.h> |
22 | #include <nvgpu/semaphore.h> | 22 | #include <nvgpu/semaphore.h> |
23 | #include <nvgpu/channel.h> | 23 | #include <nvgpu/channel.h> |
24 | #include <nvgpu/channel_sync.h> | ||
24 | 25 | ||
25 | #include "gk20a/channel_sync_gk20a.h" | ||
26 | #include "gk20a/mm_gk20a.h" | 26 | #include "gk20a/mm_gk20a.h" |
27 | 27 | ||
28 | #include "sync_sema_android.h" | 28 | #include "sync_sema_android.h" |
@@ -63,7 +63,7 @@ int nvgpu_os_fence_sema_wait_gen_cmd(struct nvgpu_os_fence *s, | |||
63 | sync_fence->cbs[i].sync_pt); | 63 | sync_fence->cbs[i].sync_pt); |
64 | 64 | ||
65 | sema = gk20a_sync_pt_sema(pt); | 65 | sema = gk20a_sync_pt_sema(pt); |
66 | gk20a_channel_gen_sema_wait_cmd(c, sema, wait_cmd, | 66 | channel_sync_semaphore_gen_wait_cmd(c, sema, wait_cmd, |
67 | wait_cmd_size, i); | 67 | wait_cmd_size, i); |
68 | } | 68 | } |
69 | 69 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c b/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c index b15dba19..fe09db8f 100644 --- a/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c +++ b/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c | |||
@@ -23,9 +23,9 @@ | |||
23 | #include <nvgpu/nvhost.h> | 23 | #include <nvgpu/nvhost.h> |
24 | #include <nvgpu/atomic.h> | 24 | #include <nvgpu/atomic.h> |
25 | #include <nvgpu/channel.h> | 25 | #include <nvgpu/channel.h> |
26 | #include <nvgpu/channel_sync.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
28 | #include "gk20a/channel_sync_gk20a.h" | ||
29 | #include "gk20a/mm_gk20a.h" | 29 | #include "gk20a/mm_gk20a.h" |
30 | 30 | ||
31 | #include "../drivers/staging/android/sync.h" | 31 | #include "../drivers/staging/android/sync.h" |
@@ -76,7 +76,7 @@ int nvgpu_os_fence_syncpt_wait_gen_cmd(struct nvgpu_os_fence *s, | |||
76 | u32 wait_id = nvgpu_nvhost_sync_pt_id(pt); | 76 | u32 wait_id = nvgpu_nvhost_sync_pt_id(pt); |
77 | u32 wait_value = nvgpu_nvhost_sync_pt_thresh(pt); | 77 | u32 wait_value = nvgpu_nvhost_sync_pt_thresh(pt); |
78 | 78 | ||
79 | err = gk20a_channel_gen_syncpt_wait_cmd(c, wait_id, wait_value, | 79 | err = channel_sync_syncpt_gen_wait_cmd(c, wait_id, wait_value, |
80 | wait_cmd, wait_cmd_size, i, true); | 80 | wait_cmd, wait_cmd_size, i, true); |
81 | } | 81 | } |
82 | 82 | ||