include: soc: tegra: add ISP memoryinfo ring buffers

Use dedicated ringbuffers to pass ISP iova pointers between
KMD and RCE.

CAMASIL-7476

bug 2768992
bug 3231670
bug 200688288
bug 200690078

CAMASIL-7472
CAMASIL-7474
CAMASIL-7475

Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2487426
(cherry picked from commit 8c18aedcb887dd094b60ac5a0de0cf0de7d7af51)

include: soc: tegra: add VI memoryinfo ring buffer struct

Use dedicated ringbuffer to pass VI iova pointers between KMD
and RCE.

CAMASIL-7465

bug 2768992
bug 3231670
bug 200688288
bug 200690078
CAMASIL-7460
CAMASIL-7477
CAMASIL-4619

Signed-off-by: Kirill Artamonov <kartamonov@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2475649
(cherry picked from commit 896af71c8d84b2ee77b0df542b96724d117b35bf)

Signed-off-by: Kirill Artamonov <kartamonov@nvidia.com>
Change-Id: I70e3052961ea7396f632468c2e1aaf65c5caa5c6
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2544991
Reviewed-by: Igor Mitsyanko <imitsyanko@nvidia.com>
Reviewed-by: Semi Malinen <smalinen@nvidia.com>
Reviewed-by: Pekka Pessi <ppessi@nvidia.com>
Reviewed-by: Mika Liljeberg <mliljeberg@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: Igor Mitsyanko <imitsyanko@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit

1 files changed, 106 insertions, 2 deletions

diff --git a/include/soc/tegra/camrtc-capture.h b/include/soc/tegra/camrtc-capture.h
index 9d9d397ce..b56cf57af 100644
--- a/include/soc/tegra/camrtc-capture.h
+++ b/include/soc/tegra/camrtc-capture.h
@@ -189,9 +189,22 @@ struct capture_channel_config {
         uint32_t channel_id;    /* rtcpu internal - set to zero */
         uint64_t vi_channel_mask;
         iova_t requests;
+
+        /**
+        * Base address of a memory mapped ring buffer containing capture requests buffer
+        * information.
+        * The size of the buffer is queue_depth * request_memoryinfo_size
+        */
+        iova_t requests_memoryinfo;
+
         uint32_t queue_depth;
         uint32_t request_size;
 
+        /** Size of the memoryinfo buffer reserved for each capture request. */
+        uint32_t request_memoryinfo_size;
+        /** Reserved */
+        uint32_t reserved32;
+
         uint8_t slvsec_stream_main;
         uint8_t slvsec_stream_sub;
         uint16_t reserved1;
@@ -353,6 +366,31 @@ struct vi_channel_config {
 
 } __CAPTURE_IVC_ALIGN;
 
+/**
+ * @brief Memory surface specs passed from KMD to RCE
+ */
+struct memoryinfo_surface {
+       /** Surface iova address */
+       uint64_t base_address;
+       /** Surface size */
+       uint64_t size;
+};
+
+/**
+ * @brief VI capture descriptor memory information
+ *
+ * VI capture descriptor memory information shared between
+ * KMD and RCE only. This information cannot be part of
+ * capture descriptor since descriptor is shared with usermode
+ * application.
+ */
+struct capture_descriptor_memoryinfo {
+        struct memoryinfo_surface surface[VI_NUM_ATOMP_SURFACES];
+        struct memoryinfo_surface engine_status;
+        /** pad for alignment */
+        uint32_t reserved32[12];
+} __CAPTURE_DESCRIPTOR_ALIGN;
+
 struct engine_status_surface {
         uint32_t offset;
         uint32_t offset_hi;
@@ -1072,6 +1110,27 @@ struct capture_channel_isp_config {
         struct syncpoint_info progress_sp;
         struct syncpoint_info stats_progress_sp;
 
+        /**
+         * Base address of a memory mapped ring buffer containing ISP requests
+         * buffer information.
+         * The size of the buffer is queue_depth * request_memoryinfo_size
+         */
+        iova_t requests_memoryinfo;
+
+        /**
+         * Base address of a memory mapped ring buffer containing ISP program
+         * buffer information.
+         */
+        iova_t programs_memoryinfo;
+
+        /** Size of the memoryinfo buffer reserved for each capture request. */
+        uint32_t request_memoryinfo_size;
+
+        /** Size of the memoryinfo buffer reserved for each program request. */
+        uint32_t program_memoryinfo_size;
+
+        uint32_t reserved;
+
         /** Error action attributes */
         uint32_t error_mask_correctable;
         uint32_t error_mask_uncorrectable;
@@ -1091,10 +1150,10 @@ struct capture_channel_isp_config {
          * configuration.
          */
         uint32_t num_isp_gos_tables;
-        uint32_t __pad_chan2;
         iova_t isp_gos_tables[ISP_NUM_GOS_TABLES];
 } __CAPTURE_IVC_ALIGN;
 
+
 struct capture_isp_status {
         uint8_t chan_id;
         uint8_t __pad;
@@ -1108,7 +1167,6 @@ struct capture_isp_status {
 #define CAPTURE_ISP_STATUS_ERROR                U32_C(2)
 } __CAPTURE_IVC_ALIGN;
 
-
 struct capture_isp_program_status {
         uint8_t chan_id;
         uint8_t settings_id;
@@ -1422,6 +1480,48 @@ struct isp_capture_descriptor {
 } __CAPTURE_DESCRIPTOR_ALIGN;
 
 /**
+ * @brief ISP capture descriptor memory information
+ *
+ * ISP capture descriptor memory information shared between
+ * KMD and RCE only. This information cannot be part of
+ * capture descriptor since it is shared with usermode
+ * application.
+ */
+struct isp_capture_descriptor_memoryinfo {
+        struct memoryinfo_surface input_mr_surfaces[ISP_MAX_INPUT_SURFACES];
+        struct {
+                struct memoryinfo_surface surfaces[ISP_MAX_OUTPUT_SURFACES];
+        } outputs_mw[ISP_MAX_OUTPUTS];
+
+        /** Flicker band (FB) statistics buffer */
+        struct memoryinfo_surface fb_surface;
+        /** Focus metrics (FM) statistics buffer */
+        struct memoryinfo_surface fm_surface;
+        /** Auto Focus Metrics (AFM) statistics buffer */
+        struct memoryinfo_surface afm_surface; //
+        /** Local Average Clipping (LAC0) unit 0 statistics buffer */
+        struct memoryinfo_surface lac0_surface;
+        /** Local Average Clipping (LAC1) unit 1 statistics buffer */
+        struct memoryinfo_surface lac1_surface;
+        /** Histogram (H0) unit 0 statistics buffer */
+        struct memoryinfo_surface h0_surface;
+        /** Histogram (H1) unit 1 statistics buffer */
+        struct memoryinfo_surface h1_surface;
+        /** Pixel Replacement Unit (PRU) statistics buffer */
+        struct memoryinfo_surface pru_bad_surface;
+        /** Local Tone Mapping statistics buffer */
+        struct memoryinfo_surface ltm_surface;
+        /** RAW24 Histogram Unit statistics buffer */
+        struct memoryinfo_surface hist_raw24_surface;
+        /** Base address of ISP PB2 memory */
+        struct memoryinfo_surface isp_pb2_mem;
+        /** Engine result record – written by Falcon */
+        struct memoryinfo_surface engine_status;
+        /* Reserved */
+        uint64_t reserved[6];
+} __CAPTURE_DESCRIPTOR_ALIGN;
+
+/**
  * PB2 size (ATOM aligned).
  *
  * NvCapture UMD makes sure to place PB2 just after above capture
@@ -1441,6 +1541,10 @@ struct isp_capture_descriptor {
 */
 #define NVISP5_SURFACE_PB_SIZE 512
 
+/**
+ * @Size of engine status surface used in both VI and ISP
+ */
+#define NV_ENGINE_STATUS_SURFACE_SIZE          16
 
 /**
 * Downscaler configuration information that is needed for building  ISP