gpu: nvgpu: Add CHANNEL_SETUP_BIND IOCTL

For a long time now, the ALLOC_GPFIFO_EX channel IOCTL has done much
more than just gpfifo allocation, and its signature does not match
support that's needed soon. Add a new one called SETUP_BIND to hopefully
cover our future needs and deprecate ALLOC_GPFIFO_EX.

Change nvgpu internals to match this new naming as well.

Bug 200145225
Bug 200541476

Change-Id: I766f9283a064e140656f6004b2b766db70bd6cad
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1835186
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
(cherry-picked from e0c8a16c8d474eac6723fea3980833873ab921a6
in dev-main)
Reviewed-on: https://git-master.nvidia.com/r/2169882
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

2 files changed, 11 insertions, 11 deletions

diff --git a/drivers/gpu/nvgpu/include/nvgpu/channel.h b/drivers/gpu/nvgpu/include/nvgpu/channel.h
index ba3d548e..d7bf7816 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/channel.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/channel.h
@@ -38,11 +38,11 @@ struct fifo_profile_gk20a;
 struct nvgpu_channel_sync;
 struct nvgpu_gpfifo_userdata;
 
-/* Flags to be passed to gk20a_channel_alloc_gpfifo() */
-#define NVGPU_GPFIFO_FLAGS_SUPPORT_VPR                  (1U << 0U)
-#define NVGPU_GPFIFO_FLAGS_SUPPORT_DETERMINISTIC        (1U << 1U)
-#define NVGPU_GPFIFO_FLAGS_REPLAYABLE_FAULTS_ENABLE     (1U << 2U)
-#define NVGPU_GPFIFO_FLAGS_USERMODE_SUPPORT             (1U << 3U)
+/* Flags to be passed to nvgpu_channel_setup_bind() */
+#define NVGPU_SETUP_BIND_FLAGS_SUPPORT_VPR              (1U << 0U)
+#define NVGPU_SETUP_BIND_FLAGS_SUPPORT_DETERMINISTIC    (1U << 1U)
+#define NVGPU_SETUP_BIND_FLAGS_REPLAYABLE_FAULTS_ENABLE (1U << 2U)
+#define NVGPU_SETUP_BIND_FLAGS_USERMODE_SUPPORT         (1U << 3U)
 
 /* Flags to be passed to nvgpu_submit_channel_gpfifo() */
 #define NVGPU_SUBMIT_FLAGS_FENCE_WAIT   (1U << 0U)
@@ -91,8 +91,8 @@ struct gpfifo_desc {
         void *pipe;
 };
 
-struct nvgpu_gpfifo_args {
-        u32 num_entries;
+struct nvgpu_setup_bind_args {
+        u32 num_gpfifo_entries;
         u32 num_inflight_jobs;
         u32 userd_dmabuf_fd;
         u32 gpfifo_dmabuf_fd;
@@ -407,8 +407,8 @@ struct channel_gk20a *gk20a_open_new_channel(struct gk20a *g,
                 bool is_privileged_channel,
                 pid_t pid, pid_t tid);
 
-int gk20a_channel_alloc_gpfifo(struct channel_gk20a *c,
-                struct nvgpu_gpfifo_args *gpfifo_args);
+int nvgpu_channel_setup_bind(struct channel_gk20a *c,
+                struct nvgpu_setup_bind_args *args);
 
 void gk20a_channel_timeout_restart_all_channels(struct gk20a *g);
 
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
index c9002f47..d523cf5f 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
@@ -47,7 +47,7 @@ struct nvgpu_clk_arb;
 struct nvgpu_gpu_ctxsw_trace_filter;
 #endif
 struct priv_cmd_entry;
-struct nvgpu_gpfifo_args;
+struct nvgpu_setup_bind_args;
 
 #ifdef __KERNEL__
 #include <linux/notifier.h>
@@ -1604,7 +1604,7 @@ struct gk20a {
                                 struct nvgpu_gpfifo_userdata userdata,
                                 u32 start, u32 length);
                 int (*alloc_usermode_buffers)(struct channel_gk20a *c,
-                        struct nvgpu_gpfifo_args *gpfifo_args);
+                        struct nvgpu_setup_bind_args *gpfifo_args);
         } os_channel;
 
         struct gk20a_scale_profile *scale_profile;