Merge "msm: camera: cdm: Avoid presence of stale tags in BL_FIFO" into dev/msm-4.14-camx (fffee9bf) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+13 −15

Original line number	Diff line number	Diff line
		@@ -509,8 +509,8 @@ int cam_hw_cdm_submit_bl(struct cam_hw_info *cdm_hw,

		if (!rc) {
		CAM_DBG(CAM_CDM,
		"write BL success for cnt=%d with tag=%d",
		i, core->bl_tag);
		"write BL success for cnt=%d with tag=%d total_cnt=%d",
		i, core->bl_tag, req->data->cmd_arrary_count);

		CAM_DBG(CAM_CDM, "Now commit the BL");
		if (cam_hw_cdm_commit_bl_write(cdm_hw)) {
		@@ -550,18 +550,16 @@ static void cam_hw_cdm_work(struct work_struct *work)
		cdm_hw = payload->hw;
		core = (struct cam_cdm *)cdm_hw->core_info;

		CAM_DBG(CAM_CDM, "IRQ status=%x", payload->irq_status);
		CAM_DBG(CAM_CDM, "IRQ status=0x%x", payload->irq_status);
		if (payload->irq_status &
		CAM_CDM_IRQ_STATUS_INFO_INLINE_IRQ_MASK) {
		struct cam_cdm_bl_cb_request_entry *node;
		struct cam_cdm_bl_cb_request_entry node, tnode;

		CAM_DBG(CAM_CDM, "inline IRQ data=%x",
		CAM_DBG(CAM_CDM, "inline IRQ data=0x%x",
		payload->irq_data);
		mutex_lock(&cdm_hw->hw_mutex);
		node = cam_cdm_find_request_by_bl_tag(
		payload->irq_data,
		&core->bl_request_list);
		if (node) {
		list_for_each_entry_safe(node, tnode,
		&core->bl_request_list, entry) {
		if (node->request_type ==
		CAM_HW_CDM_BL_CB_CLIENT) {
		cam_cdm_notify_clients(cdm_hw,
		@@ -574,11 +572,11 @@ static void cam_hw_cdm_work(struct work_struct *work)
		node->request_type);
		}
		list_del_init(&node->entry);
		if (node->bl_tag == payload->irq_data) {
		kfree(node);
		break;
		}
		kfree(node);
		} else {
		CAM_ERR(CAM_CDM,
		"Inval node, inline_irq st=%x data=%x",
		payload->irq_status, payload->irq_data);
		}
		mutex_unlock(&cdm_hw->hw_mutex);
		}
		@@ -684,7 +682,7 @@ irqreturn_t cam_hw_cdm_irq(int irq_num, void *data)
		CAM_ERR(CAM_CDM, "Failed to Write CDM HW IRQ cmd");
		work_status = queue_work(cdm_core->work_queue, &payload->work);
		if (work_status == false) {
		CAM_ERR(CAM_CDM, "Failed to queue work for irq=%x",
		CAM_ERR(CAM_CDM, "Failed to queue work for irq=0x%x",
		payload->irq_status);
		kfree(payload);
		}

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -1538,8 +1538,8 @@ void cam_ife_cam_cdm_callback(uint32_t handle, void *userdata,
		if (status == CAM_CDM_CB_STATUS_BL_SUCCESS) {
		complete(&ctx->config_done_complete);
		CAM_DBG(CAM_ISP,
		"Called by CDM hdl=%x, udata=%pK, status=%d, cookie=%llu",
		handle, userdata, status, cookie);
		"Called by CDM hdl=%x, udata=%pK, status=%d, cookie=%llu ctx_index=%d",
		handle, userdata, status, cookie, ctx->ctx_index);
		} else {
		CAM_WARN(CAM_ISP,
		"Called by CDM hdl=%x, udata=%pK, status=%d, cookie=%llu",
		@@ -2047,15 +2047,15 @@ static int cam_ife_mgr_config_hw(void *hw_mgr_priv,
		msecs_to_jiffies(30));
		if (rc <= 0) {
		CAM_ERR(CAM_ISP,
		"config done completion timeout for req_id=%llu rc = %d",
		cfg->request_id, rc);
		"config done completion timeout for req_id=%llu rc=%d ctx_index %d",
		cfg->request_id, rc, ctx->ctx_index);
		if (rc == 0)
		rc = -ETIMEDOUT;
		} else {
		rc = 0;
		CAM_DBG(CAM_ISP,
		"config done Success for req_id=%llu",
		cfg->request_id);
		"config done Success for req_id=%llu ctx_index %d",
		cfg->request_id, ctx->ctx_index);
		}
		}
		} else {