From 3ff666c4b97c5ad869aefe0d9c335c187962c20e Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Wed, 15 Nov 2017 01:34:59 -0800 Subject: gpu: nvgpu: deprecate TSG/CHANNEL_SET_PRIORITY IOCTLs TSG/CHANNEL_SET_PRIORITY IOCTLs are deprecated and user space should be using combination of timeslice and interleave levels to decide the priority Hence remove the IOCTLs and all corresponding APIs Jira NVGPU-393 Change-Id: I7cf0785689269536eca0c278c774b0e9e74f8c2f Signed-off-by: Deepak Nibade Reviewed-on: https://git-master.nvidia.com/r/1598581 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/ioctl_channel.c | 15 ------------ drivers/gpu/nvgpu/common/linux/ioctl_tsg.c | 34 -------------------------- drivers/gpu/nvgpu/common/mm/mm.c | 1 - 3 files changed, 50 deletions(-) (limited to 'drivers/gpu/nvgpu/common') diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c index 6feb6fb7..31651795 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c @@ -1314,21 +1314,6 @@ long gk20a_channel_ioctl(struct file *filp, ((struct nvgpu_get_param_args *)buf)->value = ch->has_timedout; break; - case NVGPU_IOCTL_CHANNEL_SET_PRIORITY: - err = gk20a_busy(ch->g); - if (err) { - dev_err(dev, - "%s: failed to host gk20a for ioctl cmd: 0x%x", - __func__, cmd); - break; - } - err = ch->g->ops.fifo.channel_set_priority(ch, - ((struct nvgpu_set_priority_args *)buf)->priority); - - gk20a_idle(ch->g); - gk20a_channel_trace_sched_param( - trace_gk20a_channel_set_priority, ch); - break; case NVGPU_IOCTL_CHANNEL_ENABLE: err = gk20a_busy(ch->g); if (err) { diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c b/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c index eb223382..b17d7e74 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c @@ -296,33 +296,6 @@ int nvgpu_ioctl_tsg_dev_release(struct inode *inode, struct file *filp) return 0; } -static int gk20a_tsg_ioctl_set_priority(struct gk20a *g, - struct tsg_gk20a *tsg, struct nvgpu_set_priority_args *arg) -{ - struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g); - struct gk20a_sched_ctrl *sched = &l->sched_ctrl; - int err; - - nvgpu_mutex_acquire(&sched->control_lock); - if (sched->control_locked) { - err = -EPERM; - goto done; - } - - err = gk20a_busy(g); - if (err) { - nvgpu_err(g, "failed to power on gpu"); - goto done; - } - - err = gk20a_tsg_set_priority(g, tsg, arg->priority); - - gk20a_idle(g); -done: - nvgpu_mutex_release(&sched->control_lock); - return err; -} - static int gk20a_tsg_ioctl_set_runlist_interleave(struct gk20a *g, struct tsg_gk20a *tsg, struct nvgpu_runlist_interleave_args *arg) { @@ -475,13 +448,6 @@ long nvgpu_ioctl_tsg_dev_ioctl(struct file *filp, unsigned int cmd, break; } - case NVGPU_IOCTL_TSG_SET_PRIORITY: - { - err = gk20a_tsg_ioctl_set_priority(g, tsg, - (struct nvgpu_set_priority_args *)buf); - break; - } - case NVGPU_IOCTL_TSG_EVENT_ID_CTRL: { err = gk20a_tsg_event_id_ctrl(g, tsg, diff --git a/drivers/gpu/nvgpu/common/mm/mm.c b/drivers/gpu/nvgpu/common/mm/mm.c index 86dc46c5..db87c4c4 100644 --- a/drivers/gpu/nvgpu/common/mm/mm.c +++ b/drivers/gpu/nvgpu/common/mm/mm.c @@ -262,7 +262,6 @@ void nvgpu_init_mm_ce_context(struct gk20a *g) gk20a_ce_create_context(g, gk20a_fifo_get_fast_ce_runlist_id(g), -1, - -1, -1); if (g->mm.vidmem.ce_ctx_id == (u32)~0) -- cgit v1.2.2