nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: remove NVGPU_ALLOC_GPFIFO_EX_FLAGS_* from common code

Browse Source 
In gk20a_channel_alloc_gpfifo(), we use linux specific flags
NVGPU_ALLOC_GPFIFO_EX_FLAGS_*
Since common code should be independent of linux specific code, define new flags
NVGPU_GPFIFO_FLAGS_SUPPORT_* in common code and use them in
gk20a_channel_alloc_gpfifo()

Linux code will parse the user flags and send appropriate flags to
gk20a_channel_alloc_gpfifo()

Jira NVGPU-381

Change-Id: Ibec51903b3407175fbba727208483b0dc36a5772
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1594422
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>
This commit is contained in:
Deepak Nibade
2017-11-08 06:05:41 -08:00
committed by mobile promotions
parent cefabe7eb1
commit a17a938a48
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/gpu/nvgpu/common/linux/ioctl_channel.c
View File

@@ -455,12 +455,27 @@ clean_up:
return err;
}
int nvgpu_channel_ioctl_alloc_gpfifo(struct channel_gk20a *c,
struct nvgpu_alloc_gpfifo_ex_args *args)
static u32 nvgpu_gpfifo_user_flags_to_common_flags(u32 user_flags)
{
return gk20a_channel_alloc_gpfifo(c, args->num_entries,
args->num_inflight_jobs,
args->flags);
u32 flags = 0;
if (user_flags & NVGPU_ALLOC_GPFIFO_EX_FLAGS_VPR_ENABLED)
flags |= NVGPU_GPFIFO_FLAGS_SUPPORT_VPR;
if (user_flags & NVGPU_ALLOC_GPFIFO_EX_FLAGS_DETERMINISTIC)
flags |= NVGPU_GPFIFO_FLAGS_SUPPORT_DETERMINISTIC;
return flags;
}
static int nvgpu_channel_ioctl_alloc_gpfifo(struct channel_gk20a *c,
unsigned int num_entries,
unsigned int num_inflight_jobs,
u32 user_flags)
{
return gk20a_channel_alloc_gpfifo(c, num_entries,
num_inflight_jobs,
nvgpu_gpfifo_user_flags_to_common_flags(user_flags));
}
@@ -1031,7 +1046,7 @@ long gk20a_channel_ioctl(struct file *filp,
gk20a_idle(ch->g);
break;
}
err = gk20a_channel_alloc_gpfifo(ch,
err = nvgpu_channel_ioctl_alloc_gpfifo(ch,
alloc_gpfifo_ex_args->num_entries,
alloc_gpfifo_ex_args->num_inflight_jobs,
alloc_gpfifo_ex_args->flags);
@@ -1056,7 +1071,7 @@ long gk20a_channel_ioctl(struct file *filp,
* submitted gpfifos and another one after, for internal usage.
* Triple the requested size.
*/
err = gk20a_channel_alloc_gpfifo(ch,
err = nvgpu_channel_ioctl_alloc_gpfifo(ch,
alloc_gpfifo_args->num_entries * 3,
0,
alloc_gpfifo_args->flags);