]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
video: tegra: host: add NVHOST_IOCTL_CHANNEL_GET_CLK_RATE_LEGACY
authorShridhar Rasal <srasal@nvidia.com>
Tue, 27 Jan 2015 07:40:46 +0000 (13:10 +0530)
committerArto Merilainen <amerilainen@nvidia.com>
Wed, 28 Jan 2015 07:29:31 +0000 (23:29 -0800)
With module branching updating user space and kernel space IOCTL
definition at the same time is impossible.

This patch adds temp IOCTL NVHOST_IOCTL_CHANNEL_CLK_RATE_LEGACY.
This temp IOCTL getting added to update NVHOST_IOCTL_CHANNEL_GET_CLK_RATE
_IO macro parameter.

Bug 200067948

Change-Id: I540d097683e84729863218e9ee5ae3cd56b971cd
Signed-off-by: Shridhar Rasal <srasal@nvidia.com>
Reviewed-on: http://git-master/r/672017
Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>
Tested-by: Arto Merilainen <amerilainen@nvidia.com>
drivers/video/tegra/host/bus_client.c
include/linux/nvhost_ioctl.h

index e53721b7caaa57d326b0dd6627698387a8a1bdb0..fa7e904fb98112d0dff252de6deff14773158b19 100644 (file)
@@ -1156,6 +1156,7 @@ static long nvhost_channelctl(struct file *filp,
        }
        case NVHOST_IOCTL_CHANNEL_SET_NVMAP_FD:
                break;
+       case NVHOST_IOCTL_CHANNEL_GET_CLK_RATE_LEGACY:
        case NVHOST_IOCTL_CHANNEL_GET_CLK_RATE:
        {
                struct nvhost_clk_rate_args *arg =
index 82c7639ffa7b3b7eaad2a459fbae1cf62a6fd309..33f2d05f4d4400a0cbed57d2fe61dc219e3b4515 100644 (file)
@@ -262,8 +262,10 @@ struct nvhost_channel_map_buffer_args {
        _IOW(NVHOST_IOCTL_MAGIC, 5, struct nvhost_set_nvmap_fd_args)
 #define NVHOST_IOCTL_CHANNEL_NULL_KICKOFF      \
        _IOR(NVHOST_IOCTL_MAGIC, 6, struct nvhost_get_param_args)
-#define NVHOST_IOCTL_CHANNEL_GET_CLK_RATE              \
+#define NVHOST_IOCTL_CHANNEL_GET_CLK_RATE_LEGACY       \
        _IOR(NVHOST_IOCTL_MAGIC, 9, struct nvhost_clk_rate_args)
+#define NVHOST_IOCTL_CHANNEL_GET_CLK_RATE              \
+       _IOWR(NVHOST_IOCTL_MAGIC, 9, struct nvhost_clk_rate_args)
 #define NVHOST_IOCTL_CHANNEL_SET_CLK_RATE              \
        _IOW(NVHOST_IOCTL_MAGIC, 10, struct nvhost_clk_rate_args)
 #define NVHOST_IOCTL_CHANNEL_SET_TIMEOUT       \