msm: camera: isp: RDI-only ctx on non-EPOCH targets

For older targets, RDI does not support EPOCH configuration,
so  the unified PIX/RDI ISP context state machine is not
applicable.
Extend CAM_ISP_HW_MGR_CMD_CTX_TYPE handling to:
- Force CAM_ISP_CTX_RDI for:
  (RDI-only contexts OR lite contexts) AND targets where
  CSID EPOCH config on RDI is not supported.

On newer targets where RDI supports EPOCH configuration,
the unified PIX/RDI ISP context state machine continues
to be used.

CRs-Fixed: 4400688
Change-Id: I50e51a07f97acaf6f689b0d83db2704248671a79
Signed-off-by: Keval Sanghvi <ksanghvi@qti.qualcomm.com>

Author: KevalSanghviQti

camera/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

@@ -15318,11 +15318,25 @@ static int cam_ife_mgr_int_cmd(void                        *hw_mgr_priv,
 			isp_hw_cmd_args->u.sof_irq_enable);
 		break;
 	case CAM_ISP_HW_MGR_CMD_CTX_TYPE:
+		CAM_DBG(CAM_ISP, "Is rdi_epoch_config_not_supported : %d",
+				hw_mgr->rdi_epoch_config_not_supported);
 		if (c_ctx->flags.is_fe_enabled && c_ctx->flags.is_offline)
 			isp_hw_cmd_args->u.ctx_info.type = CAM_ISP_CTX_OFFLINE;
 		else if (c_ctx->flags.is_fe_enabled && !c_ctx->flags.is_offline &&
 				c_ctx->ctx_type != CAM_IFE_CTX_TYPE_SFE)
 			isp_hw_cmd_args->u.ctx_info.type = CAM_ISP_CTX_FS2;
+		/*
+		 * For older tagets, RDI does not support EPOCH configuration,
+		 * so unified state machine is not applicable and use RDI-only
+		 * ISP context state machine for RDI use cases.
+		 *
+		 * On newer targets, RDI supports EPOCH configuration and can use
+		 * the unified ISP context state machine (PIX/RDI).
+		 */
+		else if ((c_ctx->flags.is_rdi_only_context ||
+				c_ctx->flags.is_lite_context) &&
+				(hw_mgr->rdi_epoch_config_not_supported))
+			isp_hw_cmd_args->u.ctx_info.type = CAM_ISP_CTX_RDI;
 		else
 			isp_hw_cmd_args->u.ctx_info.type = CAM_ISP_CTX_PIX;
 		if (hw_mgr->csid_aup_rup_en)
@@ -17293,6 +17307,8 @@ static int cam_ife_hw_mgr_sort_dev_with_caps(
 			ife_hw_mgr->csid_hw_caps[i].global_reset_en;
 		ife_hw_mgr->csid_aup_rup_en =
 			ife_hw_mgr->csid_hw_caps[i].aup_rup_en;
+		ife_hw_mgr->rdi_epoch_config_not_supported =
+			ife_hw_mgr->csid_hw_caps[i].rdi_epoch_config_not_supported;
 		ife_hw_mgr->csid_camif_irq_support =
 			ife_hw_mgr->csid_hw_caps[i].camif_irq_support;
 	}

camera/drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.h

@@ -675,6 +675,7 @@ enum cam_isp_irq_inject_common_param_pos {
  * @min_clk_threshold:     Min sfe clock
  * @offline_reconfig:      offline ISP need to reconfigure or not
  * @offline_outport_sync:  Offline ISP HW needs to check outport to sync with correct hw
+ * @rdi_epoch_config_not_supported:    is RDI epoch config supported
  */
 struct cam_ife_hw_mgr {
 	struct cam_isp_hw_mgr          mgr_common;
@@ -722,6 +723,7 @@ struct cam_ife_hw_mgr {
 	uint32_t                         bytes_per_clk;
 	bool                             offline_reconfig;
 	bool                             offline_outport_sync;
+	bool                             rdi_epoch_config_not_supported;
 };
 
 /**

camera/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid170.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
  */
 #ifndef _CAM_IFE_CSID_170_H_
 #define _CAM_IFE_CSID_170_H_
@@ -391,6 +392,7 @@ static struct cam_ife_csid_ver1_common_reg_info
 	.format_measure_height_shift_val = 0x10,
 	.format_measure_width_mask_val   = 0xFFFF,
 	.format_measure_width_shift_val  = 0x0,
+	.rdi_epoch_config_not_supported  = 1,
 };
 
 static struct cam_ife_csid_ver1_reg_info cam_ife_csid_170_reg_info = {

camera/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver1.c

@@ -299,6 +299,7 @@ int cam_ife_csid_ver1_get_hw_caps(void *hw_priv,
 	hw_caps->version_incr = csid_reg->cmn_reg->version_incr;
 	hw_caps->global_reset_en = csid_reg->cmn_reg->global_reset;
 	hw_caps->aup_rup_en = csid_reg->cmn_reg->aup_rup_supported;
+	hw_caps->rdi_epoch_config_not_supported = csid_reg->cmn_reg->rdi_epoch_config_not_supported;
 	hw_caps->is_lite = soc_private->is_ife_csid_lite;
 
 	CAM_DBG(CAM_ISP,

camera/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver1.h

@@ -119,6 +119,7 @@ struct cam_ife_csid_ver1_common_reg_info {
 	uint32_t early_eof_supported;
 	uint32_t global_reset;
 	uint32_t aup_rup_supported;
+	uint32_t rdi_epoch_config_not_supported;
 
 	/* Masks */
 	uint32_t ipp_irq_mask_all;

camera/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.c

@@ -2479,6 +2479,7 @@ int cam_ife_csid_ver2_get_hw_caps(void *hw_priv,
 	hw_caps->version_incr = csid_reg->cmn_reg->version_incr;
 	hw_caps->global_reset_en = csid_reg->cmn_reg->global_reset;
 	hw_caps->aup_rup_en = csid_reg->cmn_reg->aup_rup_supported;
+	hw_caps->rdi_epoch_config_not_supported = csid_reg->cmn_reg->rdi_epoch_config_not_supported;
 	hw_caps->only_master_rup = csid_reg->cmn_reg->only_master_rup;
 	hw_caps->is_lite = soc_private->is_ife_csid_lite;
 	hw_caps->sfe_ipp_input_rdi_res = csid_reg->cmn_reg->sfe_ipp_input_rdi_res;

camera/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.h

@@ -665,6 +665,7 @@ struct cam_ife_csid_ver2_common_reg_info {
 	uint32_t early_eof_supported;
 	uint32_t global_reset;
 	uint32_t aup_rup_supported;
+	uint32_t rdi_epoch_config_not_supported;
 	uint32_t only_master_rup;
 	uint32_t sfe_ipp_input_rdi_res;
 	uint32_t phy_sel_base_idx;

camera/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_lite17x.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
  */
 
 #ifndef _CAM_IFE_CSID_LITE17X_H_
@@ -385,6 +386,7 @@ static  struct cam_ife_csid_ver1_common_reg_info
 	.format_measure_height_shift_val       = 0x10,
 	.format_measure_width_mask_val         = 0xFFFF,
 	.format_measure_width_shift_val        = 0x0,
+	.rdi_epoch_config_not_supported        = 1,
 };
 
 static  struct cam_ife_csid_ver1_reg_info cam_ife_csid_lite_17x_reg_info = {

camera/drivers/cam_isp/isp_hw_mgr/isp_hw/include/cam_ife_csid_hw_intf.h

@@ -110,6 +110,7 @@ enum cam_ife_csid_secondary_evt_type {
  * @only_master_rup:       flag to indicate if only master RUP
  * @camif_irq_support:     flag to indicate if CSID supports CAMIF irq
  * @is_ife_sfe_mapped:     flag to indicate if IFE & SFE are one-one mapped
+ * @rdi_epoch_config_not_supported: flag to indicate whether Epoch on rdi is supported or not
  */
 struct cam_ife_csid_hw_caps {
 	uint32_t      num_rdis;
@@ -125,6 +126,7 @@ struct cam_ife_csid_hw_caps {
 	bool          only_master_rup;
 	bool          camif_irq_support;
 	bool          is_ife_sfe_mapped;
+	bool          rdi_epoch_config_not_supported;
 };
 
 struct cam_isp_out_port_generic_info {