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

Commit fba32140 authored by Senthil Kumar Rajagopal's avatar Senthil Kumar Rajagopal
Browse files

msm: camera: isp: Reset HVX state during last stream off 



Currently, HVX state is reset when CAMIF is disabled. CAMIF is
disabled during normal stream off and recovery. After recovery,
HVX is not enabled since state is improper. Reset HVX state
only during last stream off to make HVX is enabled in active
session.

Change-Id: I8cf8e84dbccfb1923a59399a3802795362369e96
Signed-off-by: default avatarSenthil Kumar Rajagopal <skrajago@codeaurora.org>
parent d5d4b2a9

drivers/media/platform/msm/camera_v2/isp/msm_isp47.c

+0 −1
Original line number Diff line number Diff line
@@ -1282,7 +1282,6 @@ static void msm_vfe47_configure_hvx(struct vfe_device *vfe_dev, 
		val = msm_camera_io_r(vfe_dev->vfe_base + 0x50);

		val &= 0xFFFFFFF7;

		msm_camera_io_w_mb(val, vfe_dev->vfe_base + 0x50);

		vfe_dev->hvx_cmd = HVX_DISABLE;

	}

}

drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c

+4 −2
Original line number Diff line number Diff line
@@ -2230,8 +2230,6 @@ int msm_isp_cfg_axi_stream(struct vfe_device *vfe_dev, void *arg) 
	if (axi_data->num_active_stream == 0) {

		/*Configure UB*/

		vfe_dev->hw_info->vfe_ops.axi_ops.cfg_ub(vfe_dev);

		/* Reset hvx state */

		vfe_dev->hvx_cmd = HVX_DISABLE;

	}

	camif_update = msm_isp_get_camif_update_state(vfe_dev, stream_cfg_cmd);
@@ -2245,6 +2243,10 @@ int msm_isp_cfg_axi_stream(struct vfe_device *vfe_dev, void *arg) 
		   vfe_dev, stream_cfg_cmd, camif_update);



		msm_isp_axi_update_cgc_override(vfe_dev, stream_cfg_cmd, 0);

		if (axi_data->num_active_stream == 0) {

			/* Reset hvx state */

			vfe_dev->hvx_cmd = HVX_DISABLE;

		}

	}



	if (rc < 0)