Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4315941f authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: ife: Get last CDM done under internal command" into camera-kernel.lnx.1.0

parents 3944d27f 7729f60f

drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+4 −4
Original line number Diff line number Diff line
@@ -6486,6 +6486,10 @@ static int cam_ife_mgr_cmd(void *hw_mgr_priv, void *cmd_args) 
				isp_hw_cmd_args->u.packet_op_code =

				CAM_ISP_PACKET_UPDATE_DEV;

			break;

		case CAM_ISP_HW_MGR_GET_LAST_CDM_DONE:

			isp_hw_cmd_args->u.last_cdm_done =

				ctx->last_cdm_done_req;

			break;

		default:

			CAM_ERR(CAM_ISP, "Invalid HW mgr command:0x%x",

				hw_cmd_args->cmd_type);
@@ -6553,10 +6557,6 @@ static int cam_ife_mgr_cmd(void *hw_mgr_priv, void *cmd_args) 
	case CAM_HW_MGR_CMD_DUMP_ACQ_INFO:

		cam_ife_hw_mgr_dump_acq_data(ctx);

		break;

	case CAM_ISP_HW_MGR_GET_LAST_CDM_DONE:

		isp_hw_cmd_args->u.last_cdm_done =

			ctx->last_cdm_done_req;

		break;

	default:

		CAM_ERR(CAM_ISP, "Invalid cmd");

	}