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-09 13:49:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: camera: ife: Change halt type" into camera-kernel.lnx.4.0

Browse source
This commit is contained in:
Camera Software Integration 2020-02-26 13:13:55 -08:00 • committed by Gerrit - the friendly Code Review server
commit b4881d5569
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
View file

@ -2448,6 +2448,8 @@ static int cam_ife_mgr_acquire_hw_for_ctx(
bool crop_enable = true;
is_dual_isp = in_port->usage_type;
ife_ctx->dsp_enabled = (bool)in_port->dsp_mode;
/* get root node resource */
rc = cam_ife_hw_mgr_acquire_res_root(ife_ctx, in_port);
if (rc) {
@ -3812,7 +3814,8 @@ static int cam_ife_mgr_stop_hw(void *hw_mgr_priv, void *stop_hw_args)
stop_isp = (struct cam_isp_stop_args *)stop_args->args;
/* Set the csid halt command */
if (stop_isp->hw_stop_cmd == CAM_ISP_HW_STOP_AT_FRAME_BOUNDARY)
if ((stop_isp->hw_stop_cmd == CAM_ISP_HW_STOP_AT_FRAME_BOUNDARY) ||
ctx->dsp_enabled)
csid_halt_type = CAM_CSID_HALT_AT_FRAME_BOUNDARY;
else
csid_halt_type = CAM_CSID_HALT_IMMEDIATELY;
@ -4373,6 +4376,11 @@ static int cam_ife_mgr_release_hw(void *hw_mgr_priv,
ctx->num_reg_dump_buf = 0;
ctx->custom_enabled = false;
ctx->use_frame_header_ts = false;
ctx->num_reg_dump_buf = 0;
ctx->is_dual = false;
ctx->dsp_enabled = false;
ctx->is_fe_enabled = false;
ctx->is_offline = false;
atomic_set(&ctx->overflow_pending, 0);
for (i = 0; i < CAM_IFE_HW_NUM_MAX; i++) {
ctx->sof_cnt[i] = 0;

2
drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.h
View file

@ -89,6 +89,7 @@ struct cam_ife_hw_mgr_debug {
* @ts captured timestamp when the ctx is acquired
* @is_tpg indicate whether context is using PHY TPG
* @is_offline Indicate whether context is for offline IFE
* @dsp_enabled Indicate whether dsp is enabled in this context
*/
struct cam_ife_hw_mgr_ctx {
struct list_head list;
@ -141,6 +142,7 @@ struct cam_ife_hw_mgr_ctx {
struct timespec64 ts;
bool is_tpg;
bool is_offline;
bool dsp_enabled;
};
/**