From bdcbaa0573171df271cfc1ad75a92a334ad2f6a9 Mon Sep 17 00:00:00 2001 From: Alok Chauhan Date: Tue, 14 Nov 2023 16:10:31 +0530 Subject: [PATCH] msm: camera: enable TFE compilation on Lanai Enable bezel tfe compilation on Lanai target and fixed compilation. CRs-Fixed: 3671077 Signed-off-by: Alok Chauhan Change-Id: Ibaa618498a05f16f9544e6fcaa6ceecd6549271c --- Kconfig | 7 ++++++ camera_modules.bzl | 24 ++++++++++++++++--- crow_defconfig | 7 ++++++ drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c | 5 ++-- .../isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_core.c | 1 + ...nsolidate_defconfig => pineapple_defconfig | 0 pineapple_gki_defconfig | 13 ---------- 7 files changed, 38 insertions(+), 19 deletions(-) create mode 100644 crow_defconfig rename pineapple_consolidate_defconfig => pineapple_defconfig (100%) delete mode 100644 pineapple_gki_defconfig diff --git a/Kconfig b/Kconfig index f93a181759..f47f2cdd78 100644 --- a/Kconfig +++ b/Kconfig @@ -6,6 +6,13 @@ config SPECTRA_ISP This will enable camera ISP driver to handle IFE driver. Core camera driver to handle VFE HW. +config SPECTRA_TFE + bool "enable camera tfe modele" + help + This is enabling camera tfe module. + tfe module files will be included to enable tfe based driver, + files. + config SPECTRA_ICP bool "enable camera ICP module" help diff --git a/camera_modules.bzl b/camera_modules.bzl index 8f7d0e15b7..a8d421c7d4 100644 --- a/camera_modules.bzl +++ b/camera_modules.bzl @@ -1,5 +1,6 @@ load("//build/kernel/kleaf:kernel.bzl", "ddk_module") load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir") +load("//msm-kernel:target_variants.bzl", "get_all_variants") def _define_module(target, variant): tv = "{}_{}".format(target, variant) @@ -135,6 +136,23 @@ def _define_module(target, variant): "drivers/cam_icp/hfi.c", ], }, + "CONFIG_SPECTRA_TFE": { + True: [ + "drivers/cam_isp/isp_hw_mgr/isp_hw/ppi_hw/cam_csid_ppi_core.c", + "drivers/cam_isp/isp_hw_mgr/isp_hw/ppi_hw/cam_csid_ppi_dev.c", + "drivers/cam_isp/isp_hw_mgr/isp_hw/ppi_hw/cam_csid_ppi100.c", + "drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid.c", + "drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_dev.c", + "drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_core.c", + "drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_soc.c", + "drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_bus.c", + "drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_core.c", + "drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_soc.c", + "drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe.c", + "drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_dev.c", + "drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c", + ], + }, "CONFIG_SPECTRA_JPEG": { True: [ "drivers/cam_jpeg/jpeg_hw/jpeg_enc_hw/jpeg_enc_dev.c", @@ -237,7 +255,7 @@ def _define_module(target, variant): ) copy_to_dist_dir( - name = "{}_camera_dist".format(tv), + name = "{}_camera_dist".format(target), data = [":{}_camera".format(tv)], dist_dir = "out/target/product/{}/dlkm/lib/modules/".format(target), flat = True, @@ -247,5 +265,5 @@ def _define_module(target, variant): ) def define_camera_module(): - _define_module("pineapple", "gki") - _define_module("pineapple", "consolidate") + for (t, v) in get_all_variants(): + _define_module(t, v) diff --git a/crow_defconfig b/crow_defconfig new file mode 100644 index 0000000000..e355698e1d --- /dev/null +++ b/crow_defconfig @@ -0,0 +1,7 @@ +CONFIG_SPECTRA_ISP=y +CONFIG_SPECTRA_ICP=y +CONFIG_SPECTRA_TFE=y +CONFIG_SPECTRA_JPEG=y +CONFIG_SPECTRA_CRE=y +CONFIG_SPECTRA_SENSOR=y +CONFIG_INTERCONNECT_QCOM=y diff --git a/drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c b/drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c index 841a374c71..004d79cc92 100644 --- a/drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c +++ b/drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c @@ -5149,14 +5149,13 @@ static int cam_tfe_mgr_cmd_get_last_consumed_addr( uint32_t res_id_out; struct cam_isp_resource_node *res; struct cam_isp_hw_mgr_res *hw_mgr_res; - struct list_head *res_list_isp_src; res_id_out = done->resource_handle & 0xFF; if (res_id_out >= CAM_TFE_HW_OUT_RES_MAX) { CAM_ERR(CAM_ISP, "Invalid out resource id :%x", - res_id); - return; + res_id_out); + return rc; } hw_mgr_res = diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_core.c b/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_core.c index 3f8c735727..7f27d5e696 100644 --- a/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_core.c +++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_core.c @@ -1499,6 +1499,7 @@ static int cam_tfe_top_get_reg_update( struct cam_isp_resource_node *in_res; struct cam_isp_mode_switch_data *mup_config = NULL; struct cam_tfe_top_reg_offset_common *common_reg; + struct cam_hw_soc_info *soc_info; if (arg_size != sizeof(struct cam_isp_hw_get_cmd_update)) { CAM_ERR(CAM_ISP, "Invalid cmd size"); diff --git a/pineapple_consolidate_defconfig b/pineapple_defconfig similarity index 100% rename from pineapple_consolidate_defconfig rename to pineapple_defconfig diff --git a/pineapple_gki_defconfig b/pineapple_gki_defconfig deleted file mode 100644 index ffcad2cc93..0000000000 --- a/pineapple_gki_defconfig +++ /dev/null @@ -1,13 +0,0 @@ -CONFIG_SPECTRA_ISP=y -CONFIG_SPECTRA_ICP=y -CONFIG_SPECTRA_JPEG=y -CONFIG_SPECTRA_CRE=y -CONFIG_SPECTRA_SENSOR=y -CONFIG_SPECTRA_USE_CLK_CRM_API=y -CONFIG_SPECTRA_USE_RPMH_DRV_API=y -CONFIG_SPECTRA_LLCC_STALING=y -CONFIG_TARGET_SYNX_ENABLE=y -CONFIG_MSM_MMRM=y -CONFIG_INTERCONNECT_QCOM=y -CONFIG_DOMAIN_ID_SECURE_CAMERA=y -CONFIG_DYNAMIC_FD_PORT_CONFIG=y