Merge "msm: vidc: Set fps to 1 for image encode sessions" (ca76af06) · Commits · e / devices / android_kernel_fairphone_FP4

msm/vidc/msm_venc.c

+14 −1

Original line number	Diff line number	Diff line
		@@ -1572,6 +1572,12 @@ int msm_venc_s_ctrl(struct msm_vidc_inst inst, struct v4l2_ctrl ctrl)
		break;
		case V4L2_CID_MPEG_VIDC_VIDEO_FRAME_RATE:
		inst->clk_data.frame_rate = ctrl->val;
		/* For HEIC image encode, set fps to 1 */
		if (is_grid_session(inst)) {
		s_vpr_h(sid, "%s: set fps to 1 for HEIC\n",
		__func__);
		inst->clk_data.frame_rate = 1 << 16;
		}
		if (inst->state < MSM_VIDC_LOAD_RESOURCES)
		msm_vidc_calculate_buffer_counts(inst);
		if (inst->state == MSM_VIDC_START_DONE) {
		@@ -1847,8 +1853,15 @@ int msm_venc_s_ctrl(struct msm_vidc_inst inst, struct v4l2_ctrl ctrl)
		__func__);
		}
		break;
		case V4L2_CID_MPEG_VIDC_CAPTURE_FRAME_RATE:
		case V4L2_CID_MPEG_VIDC_IMG_GRID_SIZE:
		/* For HEIC image encode, set fps to 1 */
		if (ctrl->val) {
		s_vpr_h(sid, "%s: set fps to 1 for HEIC\n",
		__func__);
		inst->clk_data.frame_rate = 1 << 16;
		}
		break;
		case V4L2_CID_MPEG_VIDC_CAPTURE_FRAME_RATE:
		case V4L2_CID_MPEG_VIDC_VIDEO_HEVC_MAX_HIER_CODING_LAYER:
		case V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_TYPE:
		case V4L2_CID_ROTATE:

+4 −1

Original line number	Diff line number	Diff line
		@@ -1636,7 +1636,10 @@ int msm_vidc_decide_core_and_power_mode_iris1(struct msm_vidc_inst *inst)
		return -EINVAL;
		}

		if (cur_inst_load + core_load <= max_freq) {
		/* Power saving always disabled for HEIF image sessions */
		if (is_image_session(inst))
		msm_vidc_power_save_mode_enable(inst, false);
		else if (cur_inst_load + core_load <= max_freq) {
		if (mbpf > max_hq_mbpf \|\| mbps > max_hq_mbps)
		enable = true;
		msm_vidc_power_save_mode_enable(inst, enable);