Merge "ARM: qcom: disable power collapse when camera is working" (558173e6) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/media/platform/msm/camera_v2/camera/camera.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -688,8 +688,6 @@ static int camera_v4l2_open(struct file *filep)
		if (rc < 0)
		goto post_fail;
		}
		/* Enable power collapse latency */
		msm_pm_qos_update_request(CAMERA_ENABLE_PC_LATENCY);
		} else {
		rc = msm_create_command_ack_q(pvdev->vdev->num,
		find_first_zero_bit((const unsigned long *)&opn_idx,
		@@ -713,6 +711,7 @@ static int camera_v4l2_open(struct file *filep)
		command_ack_q_fail:
		msm_destroy_session(pvdev->vdev->num);
		session_fail:
		msm_pm_qos_update_request(CAMERA_ENABLE_PC_LATENCY);
		pm_relax(&pvdev->vdev->dev);
		stream_fail:
		camera_v4l2_vb2_q_release(filep);
		@@ -786,6 +785,8 @@ static int camera_v4l2_close(struct file *filep)
		camera_v4l2_vb2_q_release(filep);
		msm_destroy_session(pvdev->vdev->num);

		/* Enable power collapse latency */
		msm_pm_qos_update_request(CAMERA_ENABLE_PC_LATENCY);
		pm_relax(&pvdev->vdev->dev);
		} else {
		msm_delete_command_ack_q(pvdev->vdev->num,

+7 −2

Original line number	Diff line number	Diff line
		@@ -238,9 +238,14 @@ static void msm_pm_qos_remove_request(void)

		void msm_pm_qos_update_request(int val)
		{
		/* update just before creating the first session,
		* or after destroying the last session.
		*/
		if (msm_session_q && msm_session_q->len == 0) {
		pr_info("%s: update request %d", __func__, val);
		pm_qos_update_request(&msm_v4l2_pm_qos_request, val);
		}
		}

		struct msm_session *msm_session_find(unsigned int session_id)
		{