samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Código Incidencias Pull Requests Acciones Paquetes Proyectos Lanzamientos Wiki Actividad

Merge "msm: camera: icp: lock before updating clock status" into camera-kernel.lnx.1.0

Explorar el Código
Este commit está contenido en:
Pavan Kumar Chilamkurthi
2019-08-06 15:12:06 -07:00
cometido por Gerrit - the friendly Code Review server
padre 41fdede6bd 692d184a62
commit 93a2d068ae
Se han modificado 2 ficheros con 10 adiciones y 0 borrados
Descargar archivo de parche Descargar archivo de diferencias Expandir todos los archivos Contraer todos los archivos

5
drivers/cam_icp/icp_hw/bps_hw/bps_core.c
Ver fichero

@@ -306,6 +306,7 @@ int cam_bps_process_cmd(void *device_priv, uint32_t cmd_type,
struct cam_bps_device_core_info *core_info = NULL;
struct cam_bps_device_hw_info *hw_info = NULL;
int rc = 0;
unsigned long flags;
if (!device_priv) {
CAM_ERR(CAM_ICP, "Invalid arguments");
@@ -395,12 +396,16 @@ int cam_bps_process_cmd(void *device_priv, uint32_t cmd_type,
}
break;
case CAM_ICP_BPS_CMD_DISABLE_CLK:
spin_lock_irqsave(&bps_dev->hw_lock, flags);
if (core_info->clk_enable == true)
cam_bps_toggle_clk(soc_info, false);
core_info->clk_enable = false;
spin_unlock_irqrestore(&bps_dev->hw_lock, flags);
break;
case CAM_ICP_BPS_CMD_RESET:
spin_lock_irqsave(&bps_dev->hw_lock, flags);
rc = cam_bps_cmd_reset(soc_info, core_info);
spin_unlock_irqrestore(&bps_dev->hw_lock, flags);
break;
default:
CAM_ERR(CAM_ICP, "Invalid Cmd Type:%u", cmd_type);

5
drivers/cam_icp/icp_hw/ipe_hw/ipe_core.c
Ver fichero

@@ -305,6 +305,7 @@ int cam_ipe_process_cmd(void *device_priv, uint32_t cmd_type,
struct cam_ipe_device_core_info *core_info = NULL;
struct cam_ipe_device_hw_info *hw_info = NULL;
int rc = 0;
unsigned long flags;
if (!device_priv) {
CAM_ERR(CAM_ICP, "Invalid arguments");
@@ -389,12 +390,16 @@ int cam_ipe_process_cmd(void *device_priv, uint32_t cmd_type,
}
break;
case CAM_ICP_IPE_CMD_DISABLE_CLK:
spin_lock_irqsave(&ipe_dev->hw_lock, flags);
if (core_info->clk_enable == true)
cam_ipe_toggle_clk(soc_info, false);
core_info->clk_enable = false;
spin_unlock_irqrestore(&ipe_dev->hw_lock, flags);
break;
case CAM_ICP_IPE_CMD_RESET:
spin_lock_irqsave(&ipe_dev->hw_lock, flags);
rc = cam_ipe_cmd_reset(soc_info, core_info);
spin_unlock_irqrestore(&ipe_dev->hw_lock, flags);
break;
default:
CAM_ERR(CAM_ICP, "Invalid Cmd Type:%u", cmd_type);