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

Commit 7b893015 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge commit '5da5db28' into msm-4.9.c6 - PC 223"

parents a7f53d52 a305f288

drivers/media/platform/msm/camera/cam_cdm/cam_cdm_hw_core.c

+2 −2
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ int cam_hw_cdm_submit_bl(struct cam_hw_info *cdm_hw, 
	}



	for (i = 0; i < req->data->cmd_arrary_count ; i++) {

		uint64_t hw_vaddr_ptr = 0;

		dma_addr_t hw_vaddr_ptr = 0;

		size_t len = 0;



		if ((!cdm_cmd->cmd[i].len) &&
@@ -470,7 +470,7 @@ int cam_hw_cdm_submit_bl(struct cam_hw_info *cdm_hw, 
			}

			rc = 0;

			hw_vaddr_ptr =

				(uint64_t)cdm_cmd->cmd[i].bl_addr.hw_iova;

				(dma_addr_t) cdm_cmd->cmd[i].bl_addr.hw_iova;

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

		} else {

			CAM_ERR(CAM_CDM,

drivers/media/platform/msm/camera/cam_cpas/cam_cpas_hw.c

+4 −3
Original line number Diff line number Diff line
@@ -581,15 +581,16 @@ static int cam_cpas_util_set_camnoc_axi_clk_rate( 
				required_camnoc_bw);

		}



		required_camnoc_bw += (required_camnoc_bw *

			soc_private->camnoc_axi_clk_bw_margin) / 100;

		required_camnoc_bw += div64_u64((required_camnoc_bw *

			soc_private->camnoc_axi_clk_bw_margin), 100);



		if ((required_camnoc_bw > 0) &&

			(required_camnoc_bw <

			soc_private->camnoc_axi_min_ib_bw))

			required_camnoc_bw = soc_private->camnoc_axi_min_ib_bw;



		clk_rate = required_camnoc_bw / soc_private->camnoc_bus_width;

		clk_rate = div64_u64(required_camnoc_bw,

			soc_private->camnoc_bus_width);



		CAM_DBG(CAM_CPAS, "Setting camnoc axi clk rate : %llu %d",

			required_camnoc_bw, clk_rate);

drivers/media/platform/msm/camera/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ static int cam_fd_mgr_util_prepare_io_buf_info(int32_t iommu_hdl, 
	int rc = -EINVAL;

	uint32_t i, j, plane, num_out_buf, num_in_buf;

	struct cam_buf_io_cfg *io_cfg;

	uint64_t io_addr[CAM_PACKET_MAX_PLANES];

	dma_addr_t io_addr[CAM_PACKET_MAX_PLANES];

	uint64_t cpu_addr[CAM_PACKET_MAX_PLANES];

	size_t size;

	bool need_io_map, need_cpu_map;

drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+6 −6
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ static uint32_t cam_icp_mgr_calc_base_clk(uint32_t frame_cycles, 
	uint64_t base_clk;

	uint64_t mul = 1000000000;



	base_clk = (frame_cycles * mul) / budget;

	base_clk = div64_u64((frame_cycles * mul), budget);



	CAM_DBG(CAM_ICP, "budget = %lld fc = %d ib = %lld base_clk = %lld",

		budget, frame_cycles,
@@ -3099,7 +3099,7 @@ static int cam_icp_mgr_send_config_io(struct cam_icp_hw_ctx_data *ctx_data, 
	task_data->type = ICP_WORKQ_TASK_MSG_TYPE;

	task->process_cb = cam_icp_mgr_process_cmd;

	size_in_words = (*(uint32_t *)task_data->data) >> 2;

	CAM_INFO(CAM_ICP, "size_in_words %u", size_in_words);

	CAM_DBG(CAM_ICP, "size_in_words %u", size_in_words);

	rc = cam_req_mgr_workq_enqueue_task(task, &icp_hw_mgr,

		CRM_TASK_PRIORITY_0);

	if (rc)
@@ -3175,8 +3175,8 @@ static int cam_icp_mgr_config_hw(void *hw_mgr_priv, void *config_hw_args) 
	frame_info = (struct icp_frame_info *)config_args->priv;

	req_id = frame_info->request_id;

	idx = cam_icp_clk_idx_from_req_id(ctx_data, req_id);

	ctx_data->hfi_frame_process.fw_process_flag[idx] = true;

	cam_icp_mgr_ipe_bps_clk_update(hw_mgr, ctx_data, idx);

	ctx_data->hfi_frame_process.fw_process_flag[idx] = true;



	CAM_DBG(CAM_ICP, "req_id %llu, io config %llu", req_id,

		frame_info->io_config);
@@ -3268,7 +3268,7 @@ static int cam_icp_mgr_process_cmd_desc(struct cam_icp_hw_mgr *hw_mgr, 
{

	int rc = 0;

	int i, j, k;

	uint64_t addr;

	dma_addr_t addr;

	size_t len;

	struct cam_cmd_buf_desc *cmd_desc = NULL;

	uint64_t cpu_addr = 0;
@@ -3490,7 +3490,7 @@ static int cam_icp_process_generic_cmd_buffer( 
	struct cam_packet *packet,

	struct cam_icp_hw_ctx_data *ctx_data,

	int32_t index,

	uint64_t *io_buf_addr)

	dma_addr_t *io_buf_addr)

{

	int i, rc = 0;

	struct cam_cmd_buf_desc *cmd_desc = NULL;
@@ -4132,7 +4132,7 @@ static int cam_icp_mgr_acquire_hw(void *hw_mgr_priv, void *acquire_hw_args) 
{

	int rc = 0, bitmap_size = 0;

	uint32_t ctx_id = 0;

	uint64_t io_buf_addr;

	dma_addr_t io_buf_addr;

	size_t io_buf_size;

	struct cam_icp_hw_mgr *hw_mgr = hw_mgr_priv;

	struct cam_icp_hw_ctx_data *ctx_data = NULL;

drivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.h

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ struct clk_work_data { 
  */

struct icp_frame_info {

	uint64_t request_id;

	uint64_t io_config;

	dma_addr_t io_config;

	struct hfi_cmd_ipebps_async hfi_cfg_io_cmd;

};
@@ -238,7 +238,7 @@ struct cam_icp_hw_ctx_data { 
struct icp_cmd_generic_blob {

	struct cam_icp_hw_ctx_data *ctx;

	uint32_t frame_info_idx;

	uint64_t *io_buf_addr;

	dma_addr_t *io_buf_addr;

};



/**