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

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

Merge "msm: camera: isp: Fix HVX streaming after crash"

parents 4dc38ff2 e0b9c7fd

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

+2 −0
Original line number Diff line number Diff line
@@ -1443,6 +1443,8 @@ static void msm_vfe47_update_camif_state(struct vfe_device *vfe_dev, 
		if ((vfe_dev->hvx_cmd > HVX_DISABLE) &&

			(vfe_dev->hvx_cmd <= HVX_ROUND_TRIP))

			msm_vfe47_configure_hvx(vfe_dev, 1);

		else

			msm_vfe47_configure_hvx(vfe_dev, 0);



		bus_en =

			((vfe_dev->axi_data.

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

+1 −3
Original line number Diff line number Diff line
@@ -625,8 +625,6 @@ static int msm_isp_cfg_pix(struct vfe_device *vfe_dev, 
	}



	pix_cfg = &input_cfg->d.pix_cfg;

	if ((pix_cfg->hvx_cmd > HVX_DISABLE) &&

		(pix_cfg->hvx_cmd <= HVX_ROUND_TRIP))

	vfe_dev->hvx_cmd = pix_cfg->hvx_cmd;

	vfe_dev->is_split = input_cfg->d.pix_cfg.is_split;