Browse Source

Merge "msm: camera: isp: Dont enable Wm configurations during HW start" into camera-kernel.lnx.5.0

Savita Patted 4 years ago
parent
commit
2149b3d386

+ 3 - 4
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c

@@ -1330,10 +1330,9 @@ static int cam_vfe_bus_start_wm(
 			return -EINVAL;
 			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,
 	CAM_DBG(CAM_ISP, "WM res %d width = %d, height = %d", rsrc_data->index,
 		rsrc_data->width, rsrc_data->height);
 		rsrc_data->width, rsrc_data->height);