Merge "msm: camera: isp: Update virtual frame for IFE/SFE clients" into camera-kernel.lnx.5.0

drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/sfe_bus/cam_sfe_bus_wr.c

@@ -2769,7 +2769,8 @@ static int cam_sfe_bus_wr_update_wm_config(
 			return -EINVAL;
 		}
 
-		wm_data->en_cfg = (wm_config->wm_mode << 16) | 0x1;
+		wm_data->en_cfg = (wm_config->wm_mode << 16) |
+			(wm_config->virtual_frame_en << 1) | 0x1;
 		wm_data->width  = wm_config->width;
 
 		if (wm_config->packer_format) {

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

@@ -3648,7 +3648,8 @@ static int cam_vfe_bus_ver3_update_wm_config(
 			return -EINVAL;
 		}
 
-		wm_data->en_cfg = (wm_config->wm_mode << 16) | 0x1;
+		wm_data->en_cfg = ((wm_config->wm_mode << 16) |
+			(wm_config->virtual_frame_en << 1) | 0x1);
 		wm_data->width  = wm_config->width;
 
 		if (i == PLANE_C)