diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2017-11-08 04:57:14 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-11-08 12:09:54 -0500 |
commit | 3cb65f57d532d596bfb931f3e4b995004e36a129 (patch) | |
tree | 5583ef2ed72a9fdface37011b22f72ae12e78079 /drivers/gpu/nvgpu/common/linux/ioctl_channel.c | |
parent | c22a5af9137394524f76e1f54b4e48fe92714fec (diff) |
gpu: nvgpu: define runlist level in common code
All the runlist levels NVGPU_RUNLIST_INTERLEAVE_LEVEL_* are declared in linux
specific uapi header and used in common code
But since common code should be linux-independent, move these uses out of
common code
Define new runlist levels NVGPU_FIFO_RUNLIST_INTERLEAVE_LEVEL_* in common code
and use them wherever required
Add new API nvgpu_get_common_runlist_level() to get common runlist level of
the form NVGPU_FIFO_RUNLIST_INTERLEAVE_LEVEL_* from linux specific runlist
level of the form NVGPU_RUNLIST_INTERLEAVE_LEVEL_*
Jira NVGPU-259
Change-Id: Ic19239f0f8275683d5d1b981df530acd90e6dfbb
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1594327
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/ioctl_channel.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ioctl_channel.c | 55 |
1 files changed, 43 insertions, 12 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c index 9a867bcb..781a803e 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c | |||
@@ -914,6 +914,48 @@ clean_up: | |||
914 | return ret; | 914 | return ret; |
915 | } | 915 | } |
916 | 916 | ||
917 | /* | ||
918 | * Convert linux specific runlist level of the form NVGPU_RUNLIST_INTERLEAVE_LEVEL_* | ||
919 | * to common runlist level of the form NVGPU_FIFO_RUNLIST_INTERLEAVE_LEVEL_* | ||
920 | */ | ||
921 | u32 nvgpu_get_common_runlist_level(u32 level) | ||
922 | { | ||
923 | switch (level) { | ||
924 | case NVGPU_RUNLIST_INTERLEAVE_LEVEL_LOW: | ||
925 | return NVGPU_FIFO_RUNLIST_INTERLEAVE_LEVEL_LOW; | ||
926 | case NVGPU_RUNLIST_INTERLEAVE_LEVEL_MEDIUM: | ||
927 | return NVGPU_FIFO_RUNLIST_INTERLEAVE_LEVEL_MEDIUM; | ||
928 | case NVGPU_RUNLIST_INTERLEAVE_LEVEL_HIGH: | ||
929 | return NVGPU_FIFO_RUNLIST_INTERLEAVE_LEVEL_HIGH; | ||
930 | default: | ||
931 | pr_err("%s: incorrect runlist level\n", __func__); | ||
932 | } | ||
933 | |||
934 | return level; | ||
935 | } | ||
936 | |||
937 | static int gk20a_ioctl_channel_set_runlist_interleave(struct channel_gk20a *ch, | ||
938 | u32 level) | ||
939 | { | ||
940 | int err = 0; | ||
941 | |||
942 | err = gk20a_busy(ch->g); | ||
943 | if (err) { | ||
944 | nvgpu_err(ch->g, "failed to power on, %d", err); | ||
945 | goto fail; | ||
946 | } | ||
947 | |||
948 | level = nvgpu_get_common_runlist_level(level); | ||
949 | err = gk20a_channel_set_runlist_interleave(ch, level); | ||
950 | |||
951 | gk20a_idle(ch->g); | ||
952 | gk20a_channel_trace_sched_param( | ||
953 | trace_gk20a_channel_set_runlist_interleave, ch); | ||
954 | |||
955 | fail: | ||
956 | return err; | ||
957 | } | ||
958 | |||
917 | long gk20a_channel_ioctl(struct file *filp, | 959 | long gk20a_channel_ioctl(struct file *filp, |
918 | unsigned int cmd, unsigned long arg) | 960 | unsigned int cmd, unsigned long arg) |
919 | { | 961 | { |
@@ -1202,19 +1244,8 @@ long gk20a_channel_ioctl(struct file *filp, | |||
1202 | (struct nvgpu_channel_wdt_args *)buf); | 1244 | (struct nvgpu_channel_wdt_args *)buf); |
1203 | break; | 1245 | break; |
1204 | case NVGPU_IOCTL_CHANNEL_SET_RUNLIST_INTERLEAVE: | 1246 | case NVGPU_IOCTL_CHANNEL_SET_RUNLIST_INTERLEAVE: |
1205 | err = gk20a_busy(ch->g); | 1247 | err = gk20a_ioctl_channel_set_runlist_interleave(ch, |
1206 | if (err) { | ||
1207 | dev_err(dev, | ||
1208 | "%s: failed to host gk20a for ioctl cmd: 0x%x", | ||
1209 | __func__, cmd); | ||
1210 | break; | ||
1211 | } | ||
1212 | err = gk20a_channel_set_runlist_interleave(ch, | ||
1213 | ((struct nvgpu_runlist_interleave_args *)buf)->level); | 1248 | ((struct nvgpu_runlist_interleave_args *)buf)->level); |
1214 | |||
1215 | gk20a_idle(ch->g); | ||
1216 | gk20a_channel_trace_sched_param( | ||
1217 | trace_gk20a_channel_set_runlist_interleave, ch); | ||
1218 | break; | 1249 | break; |
1219 | case NVGPU_IOCTL_CHANNEL_SET_TIMESLICE: | 1250 | case NVGPU_IOCTL_CHANNEL_SET_TIMESLICE: |
1220 | err = gk20a_busy(ch->g); | 1251 | err = gk20a_busy(ch->g); |