Merge "msm: camera: ife: Add check for DSP enabled in acquire" into camera-kernel.lnx.4.0

Cette révision appartient à :
Haritha Chintalapati
2020-03-03 14:20:53 -08:00
révisé par Gerrit - the friendly Code Review server
révision 4243c023a9

Voir le fichier

@@ -1629,7 +1629,8 @@ static int cam_ife_mgr_acquire_cid_res(
/* Acquire Left if not already acquired */
/* For dual IFE cases, start acquiring the lower idx first */
if (ife_ctx->is_fe_enabled || in_port->usage_type)
if (ife_ctx->is_fe_enabled || in_port->usage_type ||
ife_ctx->dsp_enabled)
rc = cam_ife_hw_mgr_acquire_csid_hw(ife_hw_mgr,
&csid_acquire, true);
else