Merge "msm: camera: isp: Dont enable Wm configurations during HW start" into camera-kernel.lnx.4.0 (ec131077) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -1330,10 +1330,9 @@ static int cam_vfe_bus_start_wm(
		return -EINVAL;
		}
		}

		/* Enable WM */
		cam_io_w_mb(rsrc_data->en_cfg, common_data->mem_base +
		rsrc_data->hw_regs->cfg);
		/* enabling Wm configuratons are taken care in update_wm().
		* i.e enable wm only if io buffers are allocated
		*/

		CAM_DBG(CAM_ISP, "WM res %d width = %d, height = %d", rsrc_data->index,
		rsrc_data->width, rsrc_data->height);