Merge "msm: camera: jpeg: Update jpeg traces" into camera-kernel.lnx.5.0

drivers/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c

@@ -58,6 +58,7 @@ static int cam_jpeg_process_next_hw_update(void *priv, void *data,
 	uint32_t dev_type;
 	struct cam_jpeg_hw_cfg_req *p_cfg_req = NULL;
 	uint32_t cdm_cfg_to_insert = 0;
+	uint32_t pass_num;
 
 	if (!data || !priv) {
 		CAM_ERR(CAM_JPEG, "Invalid data");
@@ -103,10 +104,13 @@ static int cam_jpeg_process_next_hw_update(void *priv, void *data,
 	/* insert next cdm payload at index */
 	/* for enc or dma 1st pass at index 1 */
 	/* for dma 2nd pass at index 2, for 3rd at 4 */
-	if (p_cfg_req->num_hw_entry_processed == 0)
+	if (p_cfg_req->num_hw_entry_processed == 0) {
 		cdm_cfg_to_insert = CAM_JPEG_CFG;
-	else
+		pass_num = 1;
+	} else {
 		cdm_cfg_to_insert = p_cfg_req->num_hw_entry_processed + 2;
+		pass_num = 2;
+	}
 
 	CAM_DBG(CAM_JPEG, "processed %d total %d using cfg entry %d for %pK",
 		p_cfg_req->num_hw_entry_processed,
@@ -141,7 +145,10 @@ static int cam_jpeg_process_next_hw_update(void *priv, void *data,
 		goto end_error;
 	}
 
-	CAM_TRACE(CAM_JPEG, "Start JPEG ENC Req %llu", config_args->request_id);
+	CAM_TRACE(CAM_JPEG, "Start JPEG %s ctx %lld Req %llu Pass %d",
+		(dev_type == CAM_JPEG_DEV_TYPE_ENC) ? "ENC" : "DMA",
+		(uint64_t) ctx_data,
+		config_args->request_id, pass_num);
 
 	rc = hw_mgr->devices[dev_type][0]->hw_ops.start(
 		hw_mgr->devices[dev_type][0]->hw_priv, NULL, 0);

drivers/cam_jpeg/jpeg_hw/jpeg_dma_hw/jpeg_dma_core.c

@@ -182,6 +182,7 @@ irqreturn_t cam_jpeg_dma_irq(int irq_num, void *data)
 	if (CAM_JPEG_HW_IRQ_IS_FRAME_DONE(irq_status, hw_info)) {
 		spin_lock(&jpeg_dma_dev->hw_lock);
 		if (core_info->core_state == CAM_JPEG_DMA_CORE_READY) {
+			CAM_TRACE(CAM_JPEG, "DMA FrameDone IRQ");
 			core_info->result_size = 1;
 			CAM_DBG(CAM_JPEG, "result_size %d",
 				core_info->result_size);

drivers/cam_jpeg/jpeg_hw/jpeg_enc_hw/jpeg_enc_core.c

@@ -203,7 +203,7 @@ irqreturn_t cam_jpeg_enc_irq(int irq_num, void *data)
 	if (CAM_JPEG_HW_IRQ_IS_FRAME_DONE(irq_status, hw_info)) {
 		spin_lock(&jpeg_enc_dev->hw_lock);
 		if (core_info->core_state == CAM_JPEG_ENC_CORE_READY) {
-			CAM_TRACE(CAM_JPEG, "FrameDone IRQ");
+			CAM_TRACE(CAM_JPEG, "Ctx %lld ENC FrameDone IRQ", core_info->irq_cb.data);
 			encoded_size = cam_io_r_mb(mem_base +
 			core_info->jpeg_enc_hw_info->reg_offset.encode_size);
 			if (core_info->irq_cb.jpeg_hw_mgr_cb) {