diff options
| author | Bhushan Rayrikar <brayrikar@nvidia.com> | 2018-05-04 18:24:48 -0400 |
|---|---|---|
| committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-05-17 18:23:27 -0400 |
| commit | bd96812cdd6d9e290e9d7507cf40f6c6db539034 (patch) | |
| tree | 02a6fc0b3db1b4e70240f02fb4f72d80bfa911ab /include/linux | |
| parent | 186a3c7bd74276af1336af26613752a8f4f3f2ec (diff) | |
camera: kernel cleanup
* Cleanup unneeded ioctls and related code.
* Add a call to set latency allowance for VI.
* Allow ISO cleints to set their own platform specific
memory latency allowance.
* Split a long number in two to fix issues flagged by static
code analysis.
Bug 2069761
Bug 1815173
Bug 200408168
Change-Id: If66ab6f604c2bfa369d7466d2cb1f5e42a6c6a41
Signed-off-by: Bhushan Rayrikar <brayrikar@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1708678
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nvhost_isp_ioctl.h | 6 | ||||
| -rw-r--r-- | include/linux/nvhost_nvcsi_ioctl.h | 1 | ||||
| -rw-r--r-- | include/linux/nvhost_vi_ioctl.h | 7 |
3 files changed, 2 insertions, 12 deletions
diff --git a/include/linux/nvhost_isp_ioctl.h b/include/linux/nvhost_isp_ioctl.h index b5d00811b..09652b489 100644 --- a/include/linux/nvhost_isp_ioctl.h +++ b/include/linux/nvhost_isp_ioctl.h | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Tegra ISP Driver | 4 | * Tegra ISP Driver |
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2013-2015, NVIDIA CORPORATION. All rights reserved. | 6 | * Copyright (c) 2013-2018, NVIDIA CORPORATION. All rights reserved. |
| 7 | * | 7 | * |
| 8 | * This program is free software; you can redistribute it and/or modify it | 8 | * This program is free software; you can redistribute it and/or modify it |
| 9 | * under the terms and conditions of the GNU General Public License, | 9 | * under the terms and conditions of the GNU General Public License, |
| @@ -59,10 +59,6 @@ struct isp_la_bw { | |||
| 59 | * isp device. | 59 | * isp device. |
| 60 | */ | 60 | */ |
| 61 | 61 | ||
| 62 | #define NVHOST_ISP_IOCTL_SET_EMC \ | ||
| 63 | _IOW(NVHOST_ISP_IOCTL_MAGIC, 1, struct isp_emc) | ||
| 64 | #define NVHOST_ISP_IOCTL_SET_ISP_CLK _IOW(NVHOST_ISP_IOCTL_MAGIC, 2, long) | ||
| 65 | #define NVHOST_ISP_IOCTL_GET_ISP_CLK _IOW(NVHOST_ISP_IOCTL_MAGIC, 3, u64) | ||
| 66 | #define NVHOST_ISP_IOCTL_SET_ISP_LA_BW \ | 62 | #define NVHOST_ISP_IOCTL_SET_ISP_LA_BW \ |
| 67 | _IOW(NVHOST_ISP_IOCTL_MAGIC, 4, struct isp_la_bw) | 63 | _IOW(NVHOST_ISP_IOCTL_MAGIC, 4, struct isp_la_bw) |
| 68 | #endif | 64 | #endif |
diff --git a/include/linux/nvhost_nvcsi_ioctl.h b/include/linux/nvhost_nvcsi_ioctl.h index 213aae78a..91918d128 100644 --- a/include/linux/nvhost_nvcsi_ioctl.h +++ b/include/linux/nvhost_nvcsi_ioctl.h | |||
| @@ -79,7 +79,6 @@ | |||
| 79 | #define NVCSI_PHY_NUM_BRICKS 4 | 79 | #define NVCSI_PHY_NUM_BRICKS 4 |
| 80 | #define NVHOST_NVCSI_IOCTL_MAGIC 'N' | 80 | #define NVHOST_NVCSI_IOCTL_MAGIC 'N' |
| 81 | 81 | ||
| 82 | #define NVHOST_NVCSI_IOCTL_SET_NVCSI_CLK _IOW(NVHOST_NVCSI_IOCTL_MAGIC, 0, long) | ||
| 83 | #define NVHOST_NVCSI_IOCTL_DESKEW_SETUP _IOW(NVHOST_NVCSI_IOCTL_MAGIC, 1, long) | 82 | #define NVHOST_NVCSI_IOCTL_DESKEW_SETUP _IOW(NVHOST_NVCSI_IOCTL_MAGIC, 1, long) |
| 84 | #define NVHOST_NVCSI_IOCTL_DESKEW_APPLY _IOW(NVHOST_NVCSI_IOCTL_MAGIC, 2, long) | 83 | #define NVHOST_NVCSI_IOCTL_DESKEW_APPLY _IOW(NVHOST_NVCSI_IOCTL_MAGIC, 2, long) |
| 85 | 84 | ||
diff --git a/include/linux/nvhost_vi_ioctl.h b/include/linux/nvhost_vi_ioctl.h index 7a363368b..277856e84 100644 --- a/include/linux/nvhost_vi_ioctl.h +++ b/include/linux/nvhost_vi_ioctl.h | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * Tegra VI Driver | 4 | * Tegra VI Driver |
| 5 | * | 5 | * |
| 6 | * Copyright (c) 2013-2015, NVIDIA CORPORATION. All rights reserved. | 6 | * Copyright (c) 2013-2018, NVIDIA CORPORATION. All rights reserved. |
| 7 | * | 7 | * |
| 8 | * This program is free software; you can redistribute it and/or modify it | 8 | * This program is free software; you can redistribute it and/or modify it |
| 9 | * under the terms and conditions of the GNU General Public License, | 9 | * under the terms and conditions of the GNU General Public License, |
| @@ -44,9 +44,4 @@ | |||
| 44 | 44 | ||
| 45 | #define NVHOST_VI_IOCTL_ENABLE_TPG _IOW(NVHOST_VI_IOCTL_MAGIC, 1, uint) | 45 | #define NVHOST_VI_IOCTL_ENABLE_TPG _IOW(NVHOST_VI_IOCTL_MAGIC, 1, uint) |
| 46 | 46 | ||
| 47 | #define NVHOST_VI_IOCTL_SET_EMC_INFO _IOW(NVHOST_VI_IOCTL_MAGIC, 2, uint) | ||
| 48 | #define NVHOST_VI_IOCTL_SET_VI_CLK _IOW(NVHOST_VI_IOCTL_MAGIC, 3, long) | ||
| 49 | #define NVHOST_VI_IOCTL_GET_VI_CLK _IOW(NVHOST_VI_IOCTL_MAGIC, 4, u64) | ||
| 50 | #define NVHOST_VI_IOCTL_SET_VI_LA_BW _IOW(NVHOST_VI_IOCTL_MAGIC, 5, u32) | ||
| 51 | |||
| 52 | #endif | 47 | #endif |
