A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 08:36:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: camera: isp: Fix some stability issues" into camera-kernel.lnx.4.0

Browse source
This commit is contained in:
Camera Software Integration 2020-09-24 15:30:49 -07:00 • committed by Gerrit - the friendly Code Review server
commit b3256e70dd
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c
View file

@ -4264,6 +4264,8 @@ static int cam_ife_csid_process_cmd(void *hw_priv,
csid_hw_info = (struct cam_hw_info *)hw_priv;
csid_hw = (struct cam_ife_csid_hw *)csid_hw_info->core_info;
mutex_lock(&csid_hw->hw_info->hw_mutex);
switch (cmd_type) {
case CAM_IFE_CSID_CMD_GET_TIME_STAMP:
rc = cam_ife_csid_get_time_stamp(csid_hw, cmd_args);
@ -4307,6 +4309,8 @@ static int cam_ife_csid_process_cmd(void *hw_priv,
break;
}
mutex_unlock(&csid_hw->hw_info->hw_mutex);
return rc;
}

16
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_camif_ver3.c
View file

@ -1482,10 +1482,6 @@ static int cam_vfe_camif_ver3_handle_irq_bottom_half(void *handler_priv,
"current monotonic time stamp seconds %lld:%lld",
ts.tv_sec, ts.tv_nsec/1000);
if (camif_priv->event_cb)
camif_priv->event_cb(camif_priv->priv,
CAM_ISP_HW_EVENT_ERROR, (void *)&evt_info);
ret = CAM_VFE_IRQ_STATUS_OVERFLOW;
CAM_INFO(CAM_ISP, "ife_clk_src:%lld",
@ -1495,6 +1491,10 @@ static int cam_vfe_camif_ver3_handle_irq_bottom_half(void *handler_priv,
if (camif_priv->camif_debug & CAMIF_DEBUG_ENABLE_REG_DUMP)
cam_vfe_camif_ver3_reg_dump(camif_node);
if (camif_priv->event_cb)
camif_priv->event_cb(camif_priv->priv,
CAM_ISP_HW_EVENT_ERROR, (void *)&evt_info);
}
if (irq_status[CAM_IFE_IRQ_CAMIF_REG_STATUS0]
@ -1514,10 +1514,6 @@ static int cam_vfe_camif_ver3_handle_irq_bottom_half(void *handler_priv,
"current monotonic time stamp seconds %lld:%lld",
ts.tv_sec, ts.tv_nsec/1000);
if (camif_priv->event_cb)
camif_priv->event_cb(camif_priv->priv,
CAM_ISP_HW_EVENT_ERROR, (void *)&evt_info);
ret = CAM_VFE_IRQ_STATUS_VIOLATION;
CAM_INFO(CAM_ISP, "ife_clk_src:%lld",
@ -1527,6 +1523,10 @@ static int cam_vfe_camif_ver3_handle_irq_bottom_half(void *handler_priv,
if (camif_priv->camif_debug & CAMIF_DEBUG_ENABLE_REG_DUMP)
cam_vfe_camif_ver3_reg_dump(camif_node);
if (camif_priv->event_cb)
camif_priv->event_cb(camif_priv->priv,
CAM_ISP_HW_EVENT_ERROR, (void *)&evt_info);
}
if (camif_priv->camif_debug & CAMIF_DEBUG_ENABLE_SENSOR_DIAG_STATUS) {