Merge "msm: camera: cdm: Add CDM cmd_type WAIT in dump util" into camera-kernel.lnx.4.0

drivers/cam_cdm/cam_cdm_util.c

@@ -229,7 +229,7 @@ uint32_t cdm_required_size_changebase(void)
 
 uint32_t cdm_required_size_comp_wait(void)
 {
-	return cdm_get_cmd_header_size(CAM_CDM_COMP_WAIT);
+	return cdm_get_cmd_header_size(CAM_CDM_CMD_COMP_WAIT);
 }
 
 uint32_t cdm_required_size_clear_comp_event(void)
@@ -387,11 +387,11 @@ uint32_t *cdm_write_wait_comp_event(
 	struct cdm_wait_comp_event_cmd *pHeader =
 		(struct cdm_wait_comp_event_cmd *)pCmdBuffer;
 
-	pHeader->cmd = CAM_CDM_COMP_WAIT;
+	pHeader->cmd = CAM_CDM_CMD_COMP_WAIT;
 	pHeader->mask1 = mask1;
 	pHeader->mask2 = mask2;
 
-	pCmdBuffer += cdm_get_cmd_header_size(CAM_CDM_COMP_WAIT);
+	pCmdBuffer += cdm_get_cmd_header_size(CAM_CDM_CMD_COMP_WAIT);
 
 	return pCmdBuffer;
 }
@@ -793,6 +793,17 @@ static long cam_cdm_util_dump_change_base_cmd(uint32_t *cmd_buf_addr)
 	return ret;
 }
 
+static long cam_cdm_util_dump_comp_wait_event_cmd(uint32_t *cmd_buf_addr)
+{
+	long ret = 0;
+
+	ret += CDMCmdHeaderSizes[CAM_CDM_CMD_COMP_WAIT];
+
+	CAM_INFO(CAM_CDM, "WAIT_EVENT");
+
+	return ret;
+}
+
 static long cam_cdm_util_dump_perf_ctrl_cmd(uint32_t *cmd_buf_addr)
 {
 	long ret = 0;
@@ -846,6 +857,10 @@ void cam_cdm_util_dump_cmd_buf(
 		case CAM_CDM_CMD_PERF_CTRL:
 			buf_now += cam_cdm_util_dump_perf_ctrl_cmd(buf_now);
 			break;
+		case CAM_CDM_CMD_COMP_WAIT:
+			buf_now +=
+				cam_cdm_util_dump_comp_wait_event_cmd(buf_now);
+			break;
 		default:
 			CAM_ERR(CAM_CDM, "Invalid CMD: 0x%x buf 0x%x",
 				cmd, *buf_now);
@@ -1014,6 +1029,10 @@ int cam_cdm_util_dump_cmd_bufs_v2(
 			buf_now += cdm_get_cmd_header_size(
 				CAM_CDM_CMD_PERF_CTRL);
 			break;
+		case CAM_CDM_CMD_COMP_WAIT:
+			buf_now += cdm_get_cmd_header_size(
+				CAM_CDM_CMD_COMP_WAIT);
+			break;
 		default:
 			CAM_ERR(CAM_CDM, "Invalid CMD: 0x%x", cmd);
 			buf_now++;

drivers/cam_cdm/cam_cdm_util.h

@@ -24,7 +24,7 @@ enum cam_cdm_command {
 	CAM_CDM_CMD_PERF_CTRL = 0x9,
 	CAM_CDM_CMD_DMI_32 = 0xa,
 	CAM_CDM_CMD_DMI_64 = 0xb,
-	CAM_CDM_COMP_WAIT = 0xc,
+	CAM_CDM_CMD_COMP_WAIT = 0xc,
 	CAM_CDM_CLEAR_COMP_WAIT = 0xd,
 	CAM_CDM_WAIT_PREFETCH_DISABLE = 0xe,
 	CAM_CDM_CMD_PRIVATE_BASE = 0xf,