video: driver: update defaults to avoid fw sync issue for enc session

Use STAGE_1 work mode and HFI_SEQ_HEADER_JOINED_WITH_1ST_FRAME
as header mode as default values to avoid firmware sync issue with
enc HEVC NV12_UBWC session.

Change-Id: If15c743ec8f9d34e6ec878e4fbbedd20f7bb4e73
Signed-off-by: Akshata Sahukar <[email protected]>

driver/platform/waipio/src/msm_vidc_waipio.c

@@ -238,7 +238,12 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
 		V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME,
 		BIT(V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE) |
 		BIT(V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME),
-		V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE,
+		/*
+		 * TODO(AS): change default to
+		 * V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE once
+		 * HW hang issue is fixed in FW rel 8
+		 */
+		V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME,
 		V4L2_CID_MPEG_VIDEO_HEADER_MODE,
 		HFI_PROP_SEQ_HEADER_MODE,
 		CAP_FLAG_ROOT | CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU,

driver/vidc/src/msm_venc.c

@@ -1400,7 +1400,7 @@ int msm_venc_inst_init(struct msm_vidc_inst *inst)
 
 	inst->prop.frame_rate = DEFAULT_FPS << 16;
 	inst->prop.operating_rate = DEFAULT_FPS << 16;
-	inst->stage = MSM_VIDC_STAGE_2;
+	inst->stage = MSM_VIDC_STAGE_1;
 	inst->pipe = MSM_VIDC_PIPE_4;
 	inst->quality_mode = MSM_VIDC_MAX_QUALITY_MODE;