Merge "msm: vidc: Initialize the dcvs load during perf mode switch" (4f4a3af6) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/vidc/msm_venc.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -3004,7 +3004,10 @@ static int try_set_ctrl(struct msm_vidc_inst inst, struct v4l2_ctrl ctrl)
		case V4L2_CID_MPEG_VIDC_SET_PERF_LEVEL:
		switch (ctrl->val) {
		case V4L2_CID_MPEG_VIDC_PERF_LEVEL_NOMINAL:
		if (inst->flags & VIDC_TURBO) {
		inst->flags &= ~VIDC_TURBO;
		msm_dcvs_init_load(inst);
		}
		break;
		case V4L2_CID_MPEG_VIDC_PERF_LEVEL_TURBO:
		inst->flags \|= VIDC_TURBO;
		@@ -3015,7 +3018,6 @@ static int try_set_ctrl(struct msm_vidc_inst inst, struct v4l2_ctrl ctrl)
		rc = -ENOTSUPP;
		break;
		}

		msm_comm_scale_clocks_and_bus(inst);
		break;
		case V4L2_CID_MPEG_VIDC_VIDEO_H264_VUI_BITSTREAM_RESTRICT: