Merge "msm: camera: vfe: Update proper write master index for RDI" (8adb4033) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -555,9 +555,9 @@ static int cam_vfe_bus_ver3_get_wm_idx(
		switch (plane) {
		case PLANE_Y:
		if (is_lite)
		wm_idx = 23;
		else
		wm_idx = 0;
		else
		wm_idx = 23;
		break;
		default:
		break;
		@@ -567,9 +567,9 @@ static int cam_vfe_bus_ver3_get_wm_idx(
		switch (plane) {
		case PLANE_Y:
		if (is_lite)
		wm_idx = 24;
		else
		wm_idx = 1;
		else
		wm_idx = 24;
		break;
		default:
		break;
		@@ -579,9 +579,9 @@ static int cam_vfe_bus_ver3_get_wm_idx(
		switch (plane) {
		case PLANE_Y:
		if (is_lite)
		wm_idx = 25;
		else
		wm_idx = 2;
		else
		wm_idx = 25;
		break;
		default:
		break;
		@@ -2578,8 +2578,8 @@ static int cam_vfe_bus_ver3_update_wm(void priv, void cmd_args,

		if ((wm_data->stride != val \|\|
		!wm_data->init_cfg_done) &&
		((!bus_priv->common_data.is_lite && wm_data->index < 23)
		\|\| bus_priv->common_data.is_lite)) {
		(!bus_priv->common_data.is_lite &&
		wm_data->index < 23)) {
		CAM_VFE_ADD_REG_VAL_PAIR(reg_val_pair, j,
		wm_data->hw_regs->image_cfg_2,
		io_cfg->planes[i].plane_stride);