Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bbe1b1b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Scale clocks with perf level change"

parents 0654ac04 88d0be3d

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

+5 −1
Original line number Diff line number Diff line
@@ -2286,6 +2286,8 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		__temp; \

	})



	v4l2_ctrl_unlock(ctrl);



	switch (ctrl->id) {

	case V4L2_CID_MPEG_VIDC_VIDEO_STREAM_FORMAT:

		property_id = HAL_PARAM_NAL_STREAM_FORMAT_SELECT;
@@ -2372,7 +2374,7 @@ 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_ALLOC_MODE_INPUT:

		if (ctrl->val == V4L2_MPEG_VIDC_VIDEO_DYNAMIC) {
@@ -2568,6 +2570,8 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
	default:

		break;

	}



	v4l2_ctrl_lock(ctrl);

#undef TRY_GET_CTRL



	if (!rc && property_id) {