From fb47ce0408a451b2d1bb7b6fc708d3df9826461a Mon Sep 17 00:00:00 2001 From: Andrew Jiang Date: Mon, 4 Jun 2018 10:35:48 -0700 Subject: media: tegra: camera: Combined requests support UMD will now send a combined request that potentially contains both process request parameters as well as program request parameters. We expect the process request parameters to always be present, but presence of the program request parameters are optional. Therefore, add isp_capture_request_ex to handle the new struct. Note: This simply reduces the number of ioctl calls from UMD to KMD from 2 to 1; we are still making 2 IVC calls to RCE for the process and program requests respectively. Bug 200391468 Change-Id: I4cf5881335f0fb076c7537945e2cd3c76ff09fa9 Signed-off-by: Andrew Jiang Reviewed-on: https://git-master.nvidia.com/r/1739342 Reviewed-by: svc-mobile-coverity Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Sudhir Vyas GVS: Gerrit_Virtual_Submit Reviewed-by: Ian Kaszubski Reviewed-by: Bhanu Murthy V Reviewed-by: mobile promotions Tested-by: mobile promotions --- include/media/capture_isp.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'include') diff --git a/include/media/capture_isp.h b/include/media/capture_isp.h index b4a03e53a..d6e0ca1ca 100644 --- a/include/media/capture_isp.h +++ b/include/media/capture_isp.h @@ -74,6 +74,12 @@ struct isp_program_req { struct capture_isp_reloc isp_program_relocs; } __ISP_CAPTURE_ALIGN; +struct isp_capture_req_ex { + struct isp_capture_req capture_req; + struct isp_program_req program_req; + uint32_t __pad[4]; +} __ISP_CAPTURE_ALIGN; + int isp_capture_init(struct tegra_isp_channel *chan); void isp_capture_shutdown(struct tegra_isp_channel *chan); int isp_capture_setup(struct tegra_isp_channel *chan, @@ -91,4 +97,6 @@ int isp_capture_status(struct tegra_isp_channel *chan, int isp_capture_program_request(struct tegra_isp_channel *chan, struct isp_program_req *req); int isp_capture_program_status(struct tegra_isp_channel *chan); +int isp_capture_request_ex(struct tegra_isp_channel *chan, + struct isp_capture_req_ex *capture_req_ex); #endif -- cgit v1.2.2