summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/nvgpu/common/linux/ioctl_channel.h2
-rw-r--r--drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c1
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_gk20a.h8
3 files changed, 3 insertions, 8 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.h b/drivers/gpu/nvgpu/common/linux/ioctl_channel.h
index f488ceca..1aac04aa 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.h
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.h
@@ -17,6 +17,8 @@ int gk20a_channel_open(struct inode *inode, struct file *filp);
17int gk20a_channel_release(struct inode *inode, struct file *filp); 17int gk20a_channel_release(struct inode *inode, struct file *filp);
18long gk20a_channel_ioctl(struct file *filp, 18long gk20a_channel_ioctl(struct file *filp,
19 unsigned int cmd, unsigned long arg); 19 unsigned int cmd, unsigned long arg);
20int gk20a_channel_open_ioctl(struct gk20a *g,
21 struct nvgpu_channel_open_args *args);
20 22
21extern const struct file_operations gk20a_event_id_ops; 23extern const struct file_operations gk20a_event_id_ops;
22extern const struct file_operations gk20a_channel_ops; 24extern const struct file_operations gk20a_channel_ops;
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
index 87ae0a3d..c8460bd9 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c
@@ -29,6 +29,7 @@
29 29
30#include "ioctl_ctrl.h" 30#include "ioctl_ctrl.h"
31#include "ioctl_tsg.h" 31#include "ioctl_tsg.h"
32#include "ioctl_channel.h"
32#include "gk20a/gk20a.h" 33#include "gk20a/gk20a.h"
33#include "gk20a/platform_gk20a.h" 34#include "gk20a/platform_gk20a.h"
34#include "gk20a/fence_gk20a.h" 35#include "gk20a/fence_gk20a.h"
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
index eb777f09..e4cce101 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h
@@ -348,14 +348,6 @@ void gk20a_channel_deterministic_unidle(struct gk20a *g);
348int nvgpu_channel_worker_init(struct gk20a *g); 348int nvgpu_channel_worker_init(struct gk20a *g);
349void nvgpu_channel_worker_deinit(struct gk20a *g); 349void nvgpu_channel_worker_deinit(struct gk20a *g);
350 350
351/* Channel file operations */
352int gk20a_channel_open(struct inode *inode, struct file *filp);
353int gk20a_channel_open_ioctl(struct gk20a *g,
354 struct nvgpu_channel_open_args *args);
355long gk20a_channel_ioctl(struct file *filp,
356 unsigned int cmd,
357 unsigned long arg);
358int gk20a_channel_release(struct inode *inode, struct file *filp);
359struct channel_gk20a *gk20a_get_channel_from_file(int fd); 351struct channel_gk20a *gk20a_get_channel_from_file(int fd);
360void gk20a_channel_update(struct channel_gk20a *c); 352void gk20a_channel_update(struct channel_gk20a *c);
361 353