Merge "drm/msm/dp: modify the voltage and pre-emphasis settings" (352168b1) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/drm/msm/dp/dp_catalog.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -59,17 +59,17 @@
		}

		static u8 const vm_pre_emphasis[4][4] = {
		{0x00, 0x0B, 0x12, 0xFF}, /* pe0, 0 db */
		{0x00, 0x0A, 0x12, 0xFF}, /* pe1, 3.5 db */
		{0x00, 0x0C, 0xFF, 0xFF}, /* pe2, 6.0 db */
		{0x00, 0x0B, 0x14, 0xFF}, /* pe0, 0 db */
		{0x00, 0x0B, 0x12, 0xFF}, /* pe1, 3.5 db */
		{0x00, 0x0B, 0xFF, 0xFF}, /* pe2, 6.0 db */
		{0xFF, 0xFF, 0xFF, 0xFF} /* pe3, 9.5 db */
		};

		/* voltage swing, 0.2v and 1.0v are not support */
		static u8 const vm_voltage_swing[4][4] = {
		{0x07, 0x0F, 0x14, 0xFF}, /* sw0, 0.4v */
		{0x11, 0x1D, 0x1F, 0xFF}, /* sw1, 0.6 v */
		{0x18, 0x1F, 0xFF, 0xFF}, /* sw1, 0.8 v */
		{0x07, 0x0F, 0x16, 0xFF}, /* sw0, 0.4v */
		{0x11, 0x1E, 0x1F, 0xFF}, /* sw1, 0.6 v */
		{0x19, 0x1F, 0xFF, 0xFF}, /* sw1, 0.8 v */
		{0xFF, 0xFF, 0xFF, 0xFF} /* sw1, 1.2 v, optional */
		};

drivers/gpu/drm/msm/dp/dp_catalog_v200.c

+73 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,24 @@
		dp_catalog->priv.data; \
		})

		#define MAX_VOLTAGE_LEVELS 4
		#define MAX_PRE_EMP_LEVELS 4

		static u8 const vm_pre_emphasis[MAX_VOLTAGE_LEVELS][MAX_PRE_EMP_LEVELS] = {
		{0x00, 0x0B, 0x12, 0xFF}, /* pe0, 0 db */
		{0x00, 0x0A, 0x12, 0xFF}, /* pe1, 3.5 db */
		{0x00, 0x0C, 0xFF, 0xFF}, /* pe2, 6.0 db */
		{0xFF, 0xFF, 0xFF, 0xFF} /* pe3, 9.5 db */
		};

		/* voltage swing, 0.2v and 1.0v are not support */
		static u8 const vm_voltage_swing[MAX_VOLTAGE_LEVELS][MAX_PRE_EMP_LEVELS] = {
		{0x07, 0x0F, 0x14, 0xFF}, /* sw0, 0.4v */
		{0x11, 0x1D, 0x1F, 0xFF}, /* sw1, 0.6 v */
		{0x18, 0x1F, 0xFF, 0xFF}, /* sw1, 0.8 v */
		{0xFF, 0xFF, 0xFF, 0xFF} /* sw1, 1.2 v, optional */
		};

		struct dp_catalog_io {
		struct dp_io_data *dp_ahb;
		struct dp_io_data *dp_aux;
		@@ -185,6 +203,60 @@ static void dp_catalog_panel_config_msa_v200(struct dp_catalog_panel *panel,
		dp_write(catalog->exe_mode, io_data, DP_SOFTWARE_NVID, nvid);
		}

		static void dp_catalog_ctrl_update_vx_px_v200(struct dp_catalog_ctrl *ctrl,
		u8 v_level, u8 p_level)
		{
		struct dp_catalog_private_v200 *catalog;
		struct dp_io_data *io_data;
		u8 value0, value1;

		if (!ctrl \|\| !((v_level < MAX_VOLTAGE_LEVELS)
		&& (p_level < MAX_PRE_EMP_LEVELS))) {
		pr_err("invalid input\n");
		return;
		}

		catalog = dp_catalog_get_priv_v200(ctrl);

		pr_debug("hw: v=%d p=%d\n", v_level, p_level);

		value0 = vm_voltage_swing[v_level][p_level];
		value1 = vm_pre_emphasis[v_level][p_level];

		/* program default setting first */
		io_data = catalog->io->dp_ln_tx0;
		dp_write(catalog->exe_mode, io_data, TXn_TX_DRV_LVL, 0x2A);
		dp_write(catalog->exe_mode, io_data, TXn_TX_EMP_POST1_LVL, 0x20);

		io_data = catalog->io->dp_ln_tx1;
		dp_write(catalog->exe_mode, io_data, TXn_TX_DRV_LVL, 0x2A);
		dp_write(catalog->exe_mode, io_data, TXn_TX_EMP_POST1_LVL, 0x20);

		/* Enable MUX to use Cursor values from these registers */
		value0 \|= BIT(5);
		value1 \|= BIT(5);

		/* Configure host and panel only if both values are allowed */
		if (value0 != 0xFF && value1 != 0xFF) {
		io_data = catalog->io->dp_ln_tx0;
		dp_write(catalog->exe_mode, io_data, TXn_TX_DRV_LVL, value0);
		dp_write(catalog->exe_mode, io_data, TXn_TX_EMP_POST1_LVL,
		value1);

		io_data = catalog->io->dp_ln_tx1;
		dp_write(catalog->exe_mode, io_data, TXn_TX_DRV_LVL, value0);
		dp_write(catalog->exe_mode, io_data, TXn_TX_EMP_POST1_LVL,
		value1);

		pr_debug("hw: vx_value=0x%x px_value=0x%x\n",
		value0, value1);
		} else {
		pr_err("invalid vx (0x%x=0x%x), px (0x%x=0x%x\n",
		v_level, value0, p_level, value1);
		}
		}


		static void dp_catalog_ctrl_lane_mapping_v200(struct dp_catalog_ctrl *ctrl,
		bool flipped, char *lane_map)
		{
		@@ -290,6 +362,7 @@ int dp_catalog_get_v200(struct device dev, struct dp_catalog catalog,

		catalog->panel.config_msa = dp_catalog_panel_config_msa_v200;

		catalog->ctrl.update_vx_px = dp_catalog_ctrl_update_vx_px_v200;
		catalog->ctrl.lane_mapping = dp_catalog_ctrl_lane_mapping_v200;
		catalog->ctrl.usb_reset = dp_catalog_ctrl_usb_reset_v200;