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>

6 files changed, 6 insertions, 21 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 @@
  *
  * Tegra ISP Driver
  *
- * Copyright (c) 2013-2015, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2013-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -59,10 +59,6 @@ struct isp_la_bw {
  * isp device.
  */
 
-#define NVHOST_ISP_IOCTL_SET_EMC \
-                _IOW(NVHOST_ISP_IOCTL_MAGIC, 1, struct isp_emc)
-#define NVHOST_ISP_IOCTL_SET_ISP_CLK _IOW(NVHOST_ISP_IOCTL_MAGIC, 2, long)
-#define NVHOST_ISP_IOCTL_GET_ISP_CLK _IOW(NVHOST_ISP_IOCTL_MAGIC, 3, u64)
 #define NVHOST_ISP_IOCTL_SET_ISP_LA_BW \
                 _IOW(NVHOST_ISP_IOCTL_MAGIC, 4, struct isp_la_bw)
 #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 @@
 #define NVCSI_PHY_NUM_BRICKS            4
 #define NVHOST_NVCSI_IOCTL_MAGIC 'N'
 
-#define NVHOST_NVCSI_IOCTL_SET_NVCSI_CLK _IOW(NVHOST_NVCSI_IOCTL_MAGIC, 0, long)
 #define NVHOST_NVCSI_IOCTL_DESKEW_SETUP  _IOW(NVHOST_NVCSI_IOCTL_MAGIC, 1, long)
 #define NVHOST_NVCSI_IOCTL_DESKEW_APPLY  _IOW(NVHOST_NVCSI_IOCTL_MAGIC, 2, long)
 
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 @@
  *
  * Tegra VI Driver
  *
- * Copyright (c) 2013-2015, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2013-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -44,9 +44,4 @@
 
 #define NVHOST_VI_IOCTL_ENABLE_TPG _IOW(NVHOST_VI_IOCTL_MAGIC, 1, uint)
 
-#define NVHOST_VI_IOCTL_SET_EMC_INFO _IOW(NVHOST_VI_IOCTL_MAGIC, 2, uint)
-#define NVHOST_VI_IOCTL_SET_VI_CLK _IOW(NVHOST_VI_IOCTL_MAGIC, 3, long)
-#define NVHOST_VI_IOCTL_GET_VI_CLK _IOW(NVHOST_VI_IOCTL_MAGIC, 4, u64)
-#define NVHOST_VI_IOCTL_SET_VI_LA_BW _IOW(NVHOST_VI_IOCTL_MAGIC, 5, u32)
-
 #endif
diff --git a/include/media/tegra_camera_platform.h b/include/media/tegra_camera_platform.h
index e64536a5e..c7ee95155 100644
--- a/include/media/tegra_camera_platform.h
+++ b/include/media/tegra_camera_platform.h
@@ -67,6 +67,7 @@ enum tegra_camera_sensor_type {
  * @actual_clk_rate: clk rate set by nvhost
  * @bw: calculated bw for this node
  * @use_max: populated by hw engine to decide it's clocking policy
+ * @memory_latency: latency allowed for memory freq scaling
  * @pdev: pointer to platform_data
  * @sensor_type: type of sensor as defined by the enum above
  * @pixel_rate: pixel rate coming out of the sensor
@@ -88,6 +89,7 @@ struct tegra_camera_dev_info {
         unsigned long actual_clk_rate;
         u64 bw;
         bool use_max;
+        u32 memory_latency;
         struct platform_device *pdev;
         u32 sensor_type;
         u64 pixel_rate;
diff --git a/include/media/vi.h b/include/media/vi.h
index 7e149a10c..29165d249 100644
--- a/include/media/vi.h
+++ b/include/media/vi.h
@@ -1,7 +1,7 @@
 /*
  * Tegra Graphics Host VI
  *
- * Copyright (c) 2012-2017, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2012-2018, NVIDIA CORPORATION. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -19,7 +19,6 @@
 #ifndef __NVHOST_VI_H__
 #define __NVHOST_VI_H__
 
-#include <linux/platform/tegra/isomgr.h>
 #include <linux/tegra-powergate.h>
 #include <linux/clk/tegra.h>
 
@@ -95,13 +94,9 @@ struct vi {
         struct tegra_vi_stats vi_out;
         struct work_struct stats_work;
         struct tegra_vi_mfi_ctx *mfi_ctx;
-#if defined(CONFIG_TEGRA_ISOMGR)
-        tegra_isomgr_handle isomgr_handle;
-#endif
         int vi_irq;
         uint vi_bypass_bw;
         uint max_bw;
-        struct mutex update_la_lock;
         bool master_deinitialized;
         bool tpg_opened;
         bool sensor_opened;
diff --git a/include/video/vi4.h b/include/video/vi4.h
index f51ea714d..11ae95583 100644
--- a/include/video/vi4.h
+++ b/include/video/vi4.h
@@ -1,7 +1,7 @@
 /*
  * Tegra Graphics Host VI
  *
- * Copyright (c) 2015-2017 NVIDIA Corporation.  All rights reserved.
+ * Copyright (c) 2015-2018, NVIDIA Corporation.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -37,7 +37,6 @@ struct nvhost_vi_dev {
         atomic_t notify_overflow;
         atomic_t fmlite_overflow;
         struct tegra_mc_vi mc_vi;
-        struct mutex update_la_lock;
         unsigned int vi_bypass_bw;
 };
 
@@ -46,7 +45,6 @@ int nvhost_vi4_finalize_poweron(struct platform_device *);
 void nvhost_vi4_idle(struct platform_device *);
 void nvhost_vi4_busy(struct platform_device *);
 void nvhost_vi4_reset(struct platform_device *);
-extern const struct file_operations nvhost_vi4_ctrl_ops;
 int nvhost_vi4_aggregate_constraints(struct platform_device *dev,
                                 int clk_index,
                                 unsigned long floor_rate,