diff options
author | Debarshi Dutta <ddutta@nvidia.com> | 2018-09-04 08:09:36 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-09-18 02:39:24 -0400 |
commit | 2517d59be282426eec7a97745b76d745ff36c388 (patch) | |
tree | faf915b5cfffb781918d674ec7d769feb7e98ac8 /drivers/gpu/nvgpu/os/linux/ioctl_channel.c | |
parent | 8381eeea4f9b4717854387068ddf9244973e7d0d (diff) |
gpu: nvgpu: move channel_sync_gk20a.* to common directory
1) Move channel_sync_gk20a.* from gk20a/ to common/ directory as they
donot program any hardware registers. Also as an add-on rename
channel_sync_gk20a.* to channel_sync.* and update the headers
in required files.
2) Rename the struct gk20a_channel_sync to struct nvgpu_channel_sync. Also,
corresponding syncpt and semaphore versions of the struct alongwith
related methods are renamed by removing "gk20a" from their names and
adding "nvgpu".
3) Add misra-c cleanups
Jira NVGPU-1086
Change-Id: I4e0e21803ca3858dd7a5fc4d2454dba1f1bfcecd
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1812594
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/os/linux/ioctl_channel.c')
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_channel.c | 4 |
1 files changed, 2 insertions, 2 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; |