Merge a07b80117ac5c721b404db7ab5c30348153a928b on remote branch (5ba82554) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -6486,6 +6486,10 @@ static int cam_ife_mgr_cmd(void hw_mgr_priv, void cmd_args)
		isp_hw_cmd_args->u.packet_op_code =
		CAM_ISP_PACKET_UPDATE_DEV;
		break;
		case CAM_ISP_HW_MGR_GET_LAST_CDM_DONE:
		isp_hw_cmd_args->u.last_cdm_done =
		ctx->last_cdm_done_req;
		break;
		default:
		CAM_ERR(CAM_ISP, "Invalid HW mgr command:0x%x",
		hw_cmd_args->cmd_type);
		@@ -6553,10 +6557,6 @@ static int cam_ife_mgr_cmd(void hw_mgr_priv, void cmd_args)
		case CAM_HW_MGR_CMD_DUMP_ACQ_INFO:
		cam_ife_hw_mgr_dump_acq_data(ctx);
		break;
		case CAM_ISP_HW_MGR_GET_LAST_CDM_DONE:
		isp_hw_cmd_args->u.last_cdm_done =
		ctx->last_cdm_done_req;
		break;
		default:
		CAM_ERR(CAM_ISP, "Invalid cmd");
		}

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -297,6 +297,12 @@ static int cam_ife_csid_get_format_rdi(
		break;
		case CAM_FORMAT_MIPI_RAW_10:
		switch (out_format) {
		case CAM_FORMAT_MIPI_RAW_8:
		case CAM_FORMAT_PLAIN8:
		*plain_fmt = 0x0;
		*decode_fmt = 0x2;
		*packing_fmt = 0;
		break;
		case CAM_FORMAT_MIPI_RAW_10:
		case CAM_FORMAT_PLAIN128:
		*decode_fmt = 0xf;

drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c

+23 −33

Original line number	Diff line number	Diff line
		@@ -3041,9 +3041,8 @@ static int cam_vfe_bus_ver3_update_wm(void priv, void cmd_args,
		struct cam_vfe_bus_ver3_wm_resource_data *wm_data = NULL;
		struct cam_vfe_bus_ver3_reg_offset_ubwc_client *ubwc_client = NULL;
		uint32_t *reg_val_pair;
		uint32_t i, j, k, size = 0;
		uint32_t i, j, size = 0;
		uint32_t frame_inc = 0, val;
		uint32_t loop_size = 0;
		bool frame_header_enable = false;

		bus_priv = (struct cam_vfe_bus_ver3_priv *) priv;
		@@ -3172,40 +3171,31 @@ static int cam_vfe_bus_ver3_update_wm(void priv, void cmd_args,
		wm_data->index, reg_val_pair[j-1]);
		}

		if ((!bus_priv->common_data.is_lite && wm_data->index > 22) \|\|
		bus_priv->common_data.is_lite)
		loop_size = wm_data->irq_subsample_period + 1;
		else
		loop_size = 1;

		/* WM Image address */
		for (k = 0; k < loop_size; k++) {

		if (wm_data->en_ubwc) {
		CAM_VFE_ADD_REG_VAL_PAIR(reg_val_pair, j,
		wm_data->hw_regs->image_addr,
		update_buf->wm_update->image_buf[i] +
		io_cfg->planes[i].meta_size +
		k * frame_inc);
		io_cfg->planes[i].meta_size);
		update_buf->wm_update->image_buf_offset[i] =
		io_cfg->planes[i].meta_size;
		} else if (wm_data->en_cfg & (0x3 << 16)) {
		CAM_VFE_ADD_REG_VAL_PAIR(reg_val_pair, j,
		wm_data->hw_regs->image_addr,
		(update_buf->wm_update->image_buf[i] +
		wm_data->offset + k * frame_inc));
		wm_data->offset));
		update_buf->wm_update->image_buf_offset[i] =
		wm_data->offset;
		} else {
		CAM_VFE_ADD_REG_VAL_PAIR(reg_val_pair, j,
		wm_data->hw_regs->image_addr,
		(update_buf->wm_update->image_buf[i] +
		k * frame_inc));
		update_buf->wm_update->image_buf[i]);
		update_buf->wm_update->image_buf_offset[i] = 0;
		}

		CAM_DBG(CAM_ISP, "WM:%d image address 0x%X",
		wm_data->index, reg_val_pair[j-1]);
		}

		CAM_VFE_ADD_REG_VAL_PAIR(reg_val_pair, j,
		wm_data->hw_regs->frame_incr, frame_inc);