Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f785d35 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 86afe4d2 on remote branch 

Change-Id: If117dc4b8922f979dc041e2fe60cbe2918d8501c
parents 5ae83f94 86afe4d2

drivers/cam_cdm/cam_cdm_hw_core.c

+0 −1
Original line number Diff line number Diff line
@@ -964,7 +964,6 @@ int cam_hw_cdm_submit_bl(struct cam_hw_info *cdm_hw, 
					rc = -EIO;

					break;

				}

				write_count--;

			}

		} else {

			CAM_ERR(CAM_CDM,

drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c

+3 −3
Original line number Diff line number Diff line
@@ -2787,15 +2787,15 @@ static int cam_tfe_mgr_stop_hw(void *hw_mgr_priv, void *stop_hw_args) 


	wait_for_completion(&ctx->config_done_complete);



	if (ctx->is_tpg)

		cam_tfe_hw_mgr_stop_hw_res(&ctx->res_list_tpg);



	if (stop_isp->stop_only)

		goto end;



	if (cam_cdm_stream_off(ctx->cdm_handle))

		CAM_ERR(CAM_ISP, "CDM stream off failed %d", ctx->cdm_handle);



	if (ctx->is_tpg)

		cam_tfe_hw_mgr_stop_hw_res(&ctx->res_list_tpg);



	cam_tfe_hw_mgr_deinit_hw(ctx);



	CAM_DBG(CAM_ISP,

drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
#define OPE_CMDS                  OPE_MAX_CMD_BUFS

#define CAM_MAX_IN_RES            8



#define OPE_MAX_CDM_BLS           16

#define OPE_MAX_CDM_BLS           24



#define CAM_OPE_MAX_PER_PATH_VOTES 6

#define CAM_OPE_BW_CONFIG_UNKNOWN  0

drivers/cam_ope/ope_hw_mgr/ope_hw/ope_core.c

+1 −0
Original line number Diff line number Diff line
@@ -393,6 +393,7 @@ static int cam_ope_dev_prepare_cdm_request( 
		ope_request->ope_kmd_buf.offset;

	cdm_cmd->cmd[i].len = len;

	cdm_cmd->cmd[i].arbitrate = arbitrate;

	cdm_cmd->cmd[i].enable_debug_gen_irq = false;



	cdm_cmd->cmd_arrary_count++;