media: tegra: camera: add control for alignment

[hercules2020/nv-tegra/linux-4.4.git] / include / media / camera_common.h

diff --git a/include/media/camera_common.h b/include/media/camera_common.h
index e1e5aa1ef5dd872340c4641d28d83dcdb8dbcacb..92670f884a4ceda0a7cc0aef6d494713170bb79f 100644 (file)
--- a/include/media/camera_common.h
+++ b/include/media/camera_common.h
@@ -60,6 +60,8 @@
 
 #define V4L2_CID_VI_BYPASS_MODE                (V4L2_CID_TEGRA_CAMERA_BASE+100)
 #define V4L2_CID_OVERRIDE_ENABLE       (V4L2_CID_TEGRA_CAMERA_BASE+101)
+#define V4L2_CID_VI_HEIGHT_ALIGN       (V4L2_CID_TEGRA_CAMERA_BASE+102)
+#define V4L2_CID_VI_SIZE_ALIGN         (V4L2_CID_TEGRA_CAMERA_BASE+103)
 
 #define MAX_BUFFER_SIZE                        32
 #define MAX_CID_CONTROLS               16
@@ -154,6 +156,16 @@ static const s64 switch_ctrl_qmenu[] = {
        SWITCH_OFF, SWITCH_ON
 };
 
+/*
+ * The memory buffers allocated from nvrm are aligned to
+ * fullfill the hardware requirements:
+ * - size in alignment with a multiple of 128K/64K bytes,
+ * see CL http://git-master/r/256468 and bug 1321091.
+ */
+static const s64 size_align_ctrl_qmenu[] = {
+       1, (64 * 1024), (128 * 1024),
+};
+
 struct camera_common_frmfmt {
        struct v4l2_frmsize_discrete    size;
        const int       *framerates;