Merge "msm: camerav2: sensor: Avoid csiphy release when used in combo mode" (8bf65755) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -1137,6 +1137,7 @@ static int32_t msm_csiphy_cmd(struct csiphy_device csiphy_dev, void arg)
		break;
		}
		csiphy_dev->csiphy_sof_debug = SOF_DEBUG_DISABLE;
		csiphy_dev->is_combo_mode = csiphy_params.combo_mode;
		rc = msm_csiphy_lane_config(csiphy_dev, &csiphy_params);
		break;
		case CSIPHY_RELEASE:
		@@ -1147,7 +1148,14 @@ static int32_t msm_csiphy_cmd(struct csiphy_device csiphy_dev, void arg)
		rc = -EFAULT;
		break;
		}
		if ((csiphy_dev->is_combo_mode == 1) &&
		(csiphy_dev->ref_count == 2)) {
		/*CSIPHY is running in Combo mode do
		not power down core*/
		csiphy_dev->ref_count--;
		} else {
		rc = msm_csiphy_release(csiphy_dev, &csi_lane_params);
		}
		break;
		default:
		pr_err("%s: %d failed\n", __func__, __LINE__);

+1 −0

Original line number	Diff line number	Diff line
		@@ -168,6 +168,7 @@ struct csiphy_device {
		uint8_t num_irq_registers;
		uint32_t csiphy_sof_debug;
		uint32_t csiphy_sof_debug_count;
		uint32_t is_combo_mode;
		};

		#define VIDIOC_MSM_CSIPHY_RELEASE \