Merge "msm: camera: isp: enable/disable hvx only if the state changed" (e53669c2) · Commits · e / devices / android_kernel_sony_msm8998

drivers/media/platform/msm/camera_v2/isp/msm_isp.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -795,6 +795,7 @@ struct vfe_device {
		struct msm_vfe_error_info error_info;
		struct msm_vfe_fetch_engine_info fetch_engine_info;
		enum msm_vfe_hvx_streaming_cmd hvx_cmd;
		uint8_t cur_hvx_state;

		/* State variables */
		uint32_t vfe_hw_version;

+5 −0

Original line number	Diff line number	Diff line
		@@ -1495,6 +1495,10 @@ void msm_vfe47_configure_hvx(struct vfe_device *vfe_dev,
		uint32_t val;
		int rc = 0;

		if (is_stream_on == vfe_dev->cur_hvx_state) {
		ISP_DBG("already in same hvx state\n");
		return;
		}
		if (vfe_dev->buf_mgr->secure_enable == SECURE_MODE) {
		pr_err("%s: Cannot configure hvx, secure_mode: %d\n",
		__func__,
		@@ -1528,6 +1532,7 @@ void msm_vfe47_configure_hvx(struct vfe_device *vfe_dev,
		val &= 0xFFFFFFF7;
		msm_camera_io_w_mb(val, vfe_dev->vfe_base + 0x50);
		}
		vfe_dev->cur_hvx_state = is_stream_on;
		}

		void msm_vfe47_update_camif_state(struct vfe_device *vfe_dev,