Commit 202aceac authored by Kuogee Hsieh's avatar Kuogee Hsieh Committed by Dmitry Baryshkov
Browse files

drm/msm/dp: replace DRM_DEBUG_DP marco with drm_dbg_dp 



Since DRM_DEBUG_DP is deprecated in favor of drm_dbg_dp(NULL, ...),
this patch replace all DRM_DEBUG_DP with drm_dbg_dp().

Changes in v4:
-- replace (strucr drm_dev *)NULL with drm_dev

Signed-off-by: default avatarKuogee Hsieh <quic_khsieh@quicinc.com>
Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/474870/
Link: https://lore.kernel.org/r/1645122930-23863-4-git-send-email-quic_khsieh@quicinc.com


[DB: fixed compilation of dp_bridge_detect() caused by previous patch]
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 13ea4799

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

+33 −17
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
struct dp_audio_private {

	struct platform_device *audio_pdev;

	struct platform_device *pdev;

	struct drm_device *drm_dev;

	struct dp_catalog *catalog;

	struct dp_panel *panel;
@@ -136,7 +137,8 @@ static void dp_audio_stream_sdp(struct dp_audio_private *audio) 
	parity_byte = dp_audio_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_1_BIT)

			| (parity_byte << PARITY_BYTE_1_BIT));

	DRM_DEBUG_DP("Header Byte 1: value = 0x%x, parity_byte = 0x%x\n",

	drm_dbg_dp(audio->drm_dev,

			"Header Byte 1: value = 0x%x, parity_byte = 0x%x\n",

			value, parity_byte);

	dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_STREAM, DP_AUDIO_SDP_HEADER_1);
@@ -148,7 +150,8 @@ static void dp_audio_stream_sdp(struct dp_audio_private *audio) 
	parity_byte = dp_audio_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_2_BIT)

			| (parity_byte << PARITY_BYTE_2_BIT));

	DRM_DEBUG_DP("Header Byte 2: value = 0x%x, parity_byte = 0x%x\n",

	drm_dbg_dp(audio->drm_dev,

			"Header Byte 2: value = 0x%x, parity_byte = 0x%x\n",

			value, parity_byte);



	dp_audio_set_header(catalog, value,
@@ -162,7 +165,8 @@ static void dp_audio_stream_sdp(struct dp_audio_private *audio) 
	parity_byte = dp_audio_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_3_BIT)

			| (parity_byte << PARITY_BYTE_3_BIT));

	DRM_DEBUG_DP("Header Byte 3: value = 0x%x, parity_byte = 0x%x\n",

	drm_dbg_dp(audio->drm_dev,

			"Header Byte 3: value = 0x%x, parity_byte = 0x%x\n",

		value, parity_byte);



	dp_audio_set_header(catalog, value,
@@ -183,7 +187,8 @@ static void dp_audio_timestamp_sdp(struct dp_audio_private *audio) 
	parity_byte = dp_audio_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_1_BIT)

			| (parity_byte << PARITY_BYTE_1_BIT));

	DRM_DEBUG_DP("Header Byte 1: value = 0x%x, parity_byte = 0x%x\n",

	drm_dbg_dp(audio->drm_dev,

			"Header Byte 1: value = 0x%x, parity_byte = 0x%x\n",

			value, parity_byte);

	dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_TIMESTAMP, DP_AUDIO_SDP_HEADER_1);
@@ -196,7 +201,8 @@ static void dp_audio_timestamp_sdp(struct dp_audio_private *audio) 
	parity_byte = dp_audio_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_2_BIT)

			| (parity_byte << PARITY_BYTE_2_BIT));

	DRM_DEBUG_DP("Header Byte 2: value = 0x%x, parity_byte = 0x%x\n",

	drm_dbg_dp(audio->drm_dev,

			"Header Byte 2: value = 0x%x, parity_byte = 0x%x\n",

			value, parity_byte);

	dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_TIMESTAMP, DP_AUDIO_SDP_HEADER_2);
@@ -209,7 +215,8 @@ static void dp_audio_timestamp_sdp(struct dp_audio_private *audio) 
	parity_byte = dp_audio_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_3_BIT)

			| (parity_byte << PARITY_BYTE_3_BIT));

	DRM_DEBUG_DP("Header Byte 3: value = 0x%x, parity_byte = 0x%x\n",

	drm_dbg_dp(audio->drm_dev,

			"Header Byte 3: value = 0x%x, parity_byte = 0x%x\n",

			value, parity_byte);

	dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_TIMESTAMP, DP_AUDIO_SDP_HEADER_3);
@@ -229,7 +236,8 @@ static void dp_audio_infoframe_sdp(struct dp_audio_private *audio) 
	parity_byte = dp_audio_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_1_BIT)

			| (parity_byte << PARITY_BYTE_1_BIT));

	DRM_DEBUG_DP("Header Byte 1: value = 0x%x, parity_byte = 0x%x\n",

	drm_dbg_dp(audio->drm_dev,

			"Header Byte 1: value = 0x%x, parity_byte = 0x%x\n",

			value, parity_byte);

	dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_INFOFRAME, DP_AUDIO_SDP_HEADER_1);
@@ -242,7 +250,8 @@ static void dp_audio_infoframe_sdp(struct dp_audio_private *audio) 
	parity_byte = dp_audio_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_2_BIT)

			| (parity_byte << PARITY_BYTE_2_BIT));

	DRM_DEBUG_DP("Header Byte 2: value = 0x%x, parity_byte = 0x%x\n",

	drm_dbg_dp(audio->drm_dev,

			"Header Byte 2: value = 0x%x, parity_byte = 0x%x\n",

			value, parity_byte);

	dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_INFOFRAME, DP_AUDIO_SDP_HEADER_2);
@@ -255,7 +264,8 @@ static void dp_audio_infoframe_sdp(struct dp_audio_private *audio) 
	parity_byte = dp_audio_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_3_BIT)

			| (parity_byte << PARITY_BYTE_3_BIT));

	DRM_DEBUG_DP("Header Byte 3: value = 0x%x, parity_byte = 0x%x\n",

	drm_dbg_dp(audio->drm_dev,

			"Header Byte 3: value = 0x%x, parity_byte = 0x%x\n",

			new_value, parity_byte);

	dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_INFOFRAME, DP_AUDIO_SDP_HEADER_3);
@@ -275,7 +285,8 @@ static void dp_audio_copy_management_sdp(struct dp_audio_private *audio) 
	parity_byte = dp_audio_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_1_BIT)

			| (parity_byte << PARITY_BYTE_1_BIT));

	DRM_DEBUG_DP("Header Byte 1: value = 0x%x, parity_byte = 0x%x\n",

	drm_dbg_dp(audio->drm_dev,

			"Header Byte 1: value = 0x%x, parity_byte = 0x%x\n",

			value, parity_byte);

	dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_COPYMANAGEMENT, DP_AUDIO_SDP_HEADER_1);
@@ -288,7 +299,8 @@ static void dp_audio_copy_management_sdp(struct dp_audio_private *audio) 
	parity_byte = dp_audio_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_2_BIT)

			| (parity_byte << PARITY_BYTE_2_BIT));

	DRM_DEBUG_DP("Header Byte 2: value = 0x%x, parity_byte = 0x%x\n",

	drm_dbg_dp(audio->drm_dev,

			"Header Byte 2: value = 0x%x, parity_byte = 0x%x\n",

			value, parity_byte);

	dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_COPYMANAGEMENT, DP_AUDIO_SDP_HEADER_2);
@@ -301,7 +313,8 @@ static void dp_audio_copy_management_sdp(struct dp_audio_private *audio) 
	parity_byte = dp_audio_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_3_BIT)

			| (parity_byte << PARITY_BYTE_3_BIT));

	DRM_DEBUG_DP("Header Byte 3: value = 0x%x, parity_byte = 0x%x\n",

	drm_dbg_dp(audio->drm_dev,

			"Header Byte 3: value = 0x%x, parity_byte = 0x%x\n",

			value, parity_byte);

	dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_COPYMANAGEMENT, DP_AUDIO_SDP_HEADER_3);
@@ -321,7 +334,8 @@ static void dp_audio_isrc_sdp(struct dp_audio_private *audio) 
	parity_byte = dp_audio_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_1_BIT)

			| (parity_byte << PARITY_BYTE_1_BIT));

	DRM_DEBUG_DP("Header Byte 1: value = 0x%x, parity_byte = 0x%x\n",

	drm_dbg_dp(audio->drm_dev,

			"Header Byte 1: value = 0x%x, parity_byte = 0x%x\n",

			value, parity_byte);

	dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_ISRC, DP_AUDIO_SDP_HEADER_1);
@@ -334,7 +348,8 @@ static void dp_audio_isrc_sdp(struct dp_audio_private *audio) 
	parity_byte = dp_audio_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_2_BIT)

			| (parity_byte << PARITY_BYTE_2_BIT));

	DRM_DEBUG_DP("Header Byte 2: value = 0x%x, parity_byte = 0x%x\n",

	drm_dbg_dp(audio->drm_dev,

			"Header Byte 2: value = 0x%x, parity_byte = 0x%x\n",

			value, parity_byte);

	dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_ISRC, DP_AUDIO_SDP_HEADER_2);
@@ -370,7 +385,7 @@ static void dp_audio_setup_acr(struct dp_audio_private *audio) 
		select = 3;

		break;

	default:

		DRM_DEBUG_DP("Unknown link rate\n");

		drm_dbg_dp(audio->drm_dev, "Unknown link rate\n");

		select = 0;

		break;

	}
@@ -395,7 +410,8 @@ static void dp_audio_safe_to_exit_level(struct dp_audio_private *audio) 
		safe_to_exit_level = 5;

		break;

	default:

		DRM_DEBUG_DP("setting the default safe_to_exit_level = %u\n",

		drm_dbg_dp(audio->drm_dev,

				"setting the default safe_to_exit_level = %u\n",

				safe_to_exit_level);

		safe_to_exit_level = 14;

		break;

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

+20 −15
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 


struct dp_catalog_private {

	struct device *dev;

	struct drm_device *drm_dev;

	struct dp_io *io;

	u32 (*audio_map)[DP_AUDIO_SDP_HEADER_MAX];

	struct dp_catalog dp_catalog;
@@ -324,7 +325,7 @@ void dp_catalog_ctrl_config_ctrl(struct dp_catalog *dp_catalog, u32 cfg) 
	struct dp_catalog_private *catalog = container_of(dp_catalog,

				struct dp_catalog_private, dp_catalog);



	DRM_DEBUG_DP("DP_CONFIGURATION_CTRL=0x%x\n", cfg);

	drm_dbg_dp(catalog->drm_dev, "DP_CONFIGURATION_CTRL=0x%x\n", cfg);



	dp_write_link(catalog, REG_DP_CONFIGURATION_CTRL, cfg);

}
@@ -352,7 +353,7 @@ void dp_catalog_ctrl_mainlink_ctrl(struct dp_catalog *dp_catalog, 
	struct dp_catalog_private *catalog = container_of(dp_catalog,

				struct dp_catalog_private, dp_catalog);



	DRM_DEBUG_DP("enable=%d\n", enable);

	drm_dbg_dp(catalog->drm_dev, "enable=%d\n", enable);

	if (enable) {

		/*

		 * To make sure link reg writes happens before other operation,
@@ -397,7 +398,7 @@ void dp_catalog_ctrl_config_misc(struct dp_catalog *dp_catalog, 
	/* Configure clock to synchronous mode */

	misc_val |= DP_MISC0_SYNCHRONOUS_CLK;



	DRM_DEBUG_DP("misc settings = 0x%x\n", misc_val);

	drm_dbg_dp(catalog->drm_dev, "misc settings = 0x%x\n", misc_val);

	dp_write_link(catalog, REG_DP_MISC1_MISC0, misc_val);

}
@@ -452,7 +453,7 @@ void dp_catalog_ctrl_config_msa(struct dp_catalog *dp_catalog, 
	if (link_rate_hbr3 == rate)

		nvid *= 3;



	DRM_DEBUG_DP("mvid=0x%x, nvid=0x%x\n", mvid, nvid);

	drm_dbg_dp(catalog->drm_dev, "mvid=0x%x, nvid=0x%x\n", mvid, nvid);

	dp_write_link(catalog, REG_DP_SOFTWARE_MVID, mvid);

	dp_write_link(catalog, REG_DP_SOFTWARE_NVID, nvid);

	dp_write_p0(catalog, MMSS_DP_DSC_DTO, 0x0);
@@ -467,7 +468,7 @@ int dp_catalog_ctrl_set_pattern_state_bit(struct dp_catalog *dp_catalog, 
				struct dp_catalog_private, dp_catalog);



	bit = BIT(state_bit - 1);

	DRM_DEBUG_DP("hw: bit=%d train=%d\n", bit, state_bit);

	drm_dbg_dp(catalog->drm_dev, "hw: bit=%d train=%d\n", bit, state_bit);

	dp_catalog_ctrl_state_ctrl(dp_catalog, bit);



	bit = BIT(state_bit - 1) << DP_MAINLINK_READY_LINK_TRAINING_SHIFT;
@@ -575,7 +576,8 @@ void dp_catalog_hpd_config_intr(struct dp_catalog *dp_catalog, 


	config = (en ? config | intr_mask : config & ~intr_mask);



	DRM_DEBUG_DP("intr_mask=%#x config=%#x\n", intr_mask, config);

	drm_dbg_dp(catalog->drm_dev, "intr_mask=%#x config=%#x\n",

					intr_mask, config);

	dp_write_aux(catalog, REG_DP_DP_HPD_INT_MASK,

				config & DP_DP_HPD_INT_MASK);

}
@@ -606,7 +608,7 @@ u32 dp_catalog_link_is_connected(struct dp_catalog *dp_catalog) 
	u32 status;



	status = dp_read_aux(catalog, REG_DP_DP_HPD_INT_STATUS);

	DRM_DEBUG_DP("aux status: %#x\n", status);

	drm_dbg_dp(catalog->drm_dev, "aux status: %#x\n", status);

	status >>= DP_DP_HPD_STATE_STATUS_BITS_SHIFT;

	status &= DP_DP_HPD_STATE_STATUS_BITS_MASK;
@@ -682,7 +684,7 @@ void dp_catalog_ctrl_send_phy_pattern(struct dp_catalog *dp_catalog, 
	/* Make sure to clear the current pattern before starting a new one */

	dp_write_link(catalog, REG_DP_STATE_CTRL, 0x0);



	DRM_DEBUG_DP("pattern: %#x\n", pattern);

	drm_dbg_dp(catalog->drm_dev, "pattern: %#x\n", pattern);

	switch (pattern) {

	case DP_PHY_TEST_PATTERN_D10_2:

		dp_write_link(catalog, REG_DP_STATE_CTRL,
@@ -743,7 +745,8 @@ void dp_catalog_ctrl_send_phy_pattern(struct dp_catalog *dp_catalog, 
				DP_STATE_CTRL_LINK_TRAINING_PATTERN4);

		break;

	default:

		DRM_DEBUG_DP("No valid test pattern requested: %#x\n", pattern);

		drm_dbg_dp(catalog->drm_dev,

				"No valid test pattern requested: %#x\n", pattern);

		break;

	}

}
@@ -850,7 +853,7 @@ void dp_catalog_panel_tpg_enable(struct dp_catalog *dp_catalog, 
				DP_BIST_ENABLE_DPBIST_EN);

	dp_write_p0(catalog, MMSS_DP_TIMING_ENGINE_EN,

				DP_TIMING_ENGINE_EN_EN);

	DRM_DEBUG_DP("%s: enabled tpg\n", __func__);

	drm_dbg_dp(catalog->drm_dev, "%s: enabled tpg\n", __func__);

}



void dp_catalog_panel_tpg_disable(struct dp_catalog *dp_catalog)
@@ -939,7 +942,8 @@ void dp_catalog_audio_config_acr(struct dp_catalog *dp_catalog) 
	select = dp_catalog->audio_data;

	acr_ctrl = select << 4 | BIT(31) | BIT(8) | BIT(14);



	DRM_DEBUG_DP("select: %#x, acr_ctrl: %#x\n", select, acr_ctrl);

	drm_dbg_dp(catalog->drm_dev, "select: %#x, acr_ctrl: %#x\n",

					select, acr_ctrl);



	dp_write_link(catalog, MMSS_DP_AUDIO_ACR_CTRL, acr_ctrl);

}
@@ -964,7 +968,7 @@ void dp_catalog_audio_enable(struct dp_catalog *dp_catalog) 
	else

		audio_ctrl &= ~BIT(0);



	DRM_DEBUG_DP("dp_audio_cfg = 0x%x\n", audio_ctrl);

	drm_dbg_dp(catalog->drm_dev, "dp_audio_cfg = 0x%x\n", audio_ctrl);



	dp_write_link(catalog, MMSS_DP_AUDIO_CFG, audio_ctrl);

	/* make sure audio engine is disabled */
@@ -995,7 +999,7 @@ void dp_catalog_audio_config_sdp(struct dp_catalog *dp_catalog) 
	/* AUDIO_INFOFRAME_SDP_EN  */

	sdp_cfg |= BIT(20);



	DRM_DEBUG_DP("sdp_cfg = 0x%x\n", sdp_cfg);

	drm_dbg_dp(catalog->drm_dev, "sdp_cfg = 0x%x\n", sdp_cfg);



	dp_write_link(catalog, MMSS_DP_SDP_CFG, sdp_cfg);
@@ -1005,7 +1009,7 @@ void dp_catalog_audio_config_sdp(struct dp_catalog *dp_catalog) 
	/* AUDIO_STREAM_HB3_REGSRC-> Do not use reg values */

	sdp_cfg2 &= ~BIT(1);



	DRM_DEBUG_DP("sdp_cfg2 = 0x%x\n", sdp_cfg2);

	drm_dbg_dp(catalog->drm_dev, "sdp_cfg2 = 0x%x\n", sdp_cfg2);



	dp_write_link(catalog, MMSS_DP_SDP_CFG2, sdp_cfg2);

}
@@ -1067,7 +1071,8 @@ void dp_catalog_audio_sfe_level(struct dp_catalog *dp_catalog) 
	mainlink_levels &= 0xFE0;

	mainlink_levels |= safe_to_exit_level;



	DRM_DEBUG_DP("mainlink_level = 0x%x, safe_to_exit_level = 0x%x\n",

	drm_dbg_dp(catalog->drm_dev,

			"mainlink_level = 0x%x, safe_to_exit_level = 0x%x\n",

			 mainlink_levels, safe_to_exit_level);



	dp_write_link(catalog, REG_DP_MAINLINK_LEVELS, mainlink_levels);

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

+62 −52
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ struct dp_vc_tu_mapping_table { 


struct dp_ctrl_private {

	struct dp_ctrl dp_ctrl;

	struct drm_device *drm_dev;

	struct device *dev;

	struct drm_dp_aux *aux;

	struct dp_panel *panel;
@@ -113,7 +114,7 @@ void dp_ctrl_push_idle(struct dp_ctrl *dp_ctrl) 
			IDLE_PATTERN_COMPLETION_TIMEOUT_JIFFIES))

		pr_warn("PUSH_IDLE pattern timedout\n");



	DRM_DEBUG_DP("mainlink off done\n");

	drm_dbg_dp(ctrl->drm_dev, "mainlink off\n");

}



static void dp_ctrl_config_ctrl(struct dp_ctrl_private *ctrl)
@@ -602,7 +603,8 @@ static void _tu_valid_boundary_calc(struct tu_algo_data *tu) 
	}

}



static void _dp_ctrl_calc_tu(struct dp_tu_calc_input *in,

static void _dp_ctrl_calc_tu(struct dp_ctrl_private *ctrl,

				struct dp_tu_calc_input *in,

				struct dp_vc_tu_mapping_table *tu_table)

{

	struct tu_algo_data *tu;
@@ -686,8 +688,8 @@ static void _dp_ctrl_calc_tu(struct dp_tu_calc_input *in, 


	if (tu->dsc_en && compare_result_1 && compare_result_2) {

		HBLANK_MARGIN += 4;

		DRM_DEBUG_DP("Info: increase HBLANK_MARGIN to %d\n",

				HBLANK_MARGIN);

		drm_dbg_dp(ctrl->drm_dev,

			"increase HBLANK_MARGIN to %d\n", HBLANK_MARGIN);

	}



tu_size_calc:
@@ -721,7 +723,9 @@ static void _dp_ctrl_calc_tu(struct dp_tu_calc_input *in, 
		tu->n_tus += 1;



	tu->even_distribution_legacy = tu->n_tus % tu->nlanes == 0 ? 1 : 0;

	DRM_DEBUG_DP("Info: n_sym = %d, num_of_tus = %d\n",



	drm_dbg_dp(ctrl->drm_dev,

			"n_sym = %d, num_of_tus = %d\n",

			tu->valid_boundary_link, tu->n_tus);



	temp1_fp = drm_fixp_from_fraction(tu->tu_size_desired, 1);
@@ -915,19 +919,20 @@ static void _dp_ctrl_calc_tu(struct dp_tu_calc_input *in, 
	tu_table->lower_boundary_count      = tu->lower_boundary_count;

	tu_table->tu_size_minus1            = tu->tu_size_minus1;



	DRM_DEBUG_DP("TU: valid_boundary_link: %d\n",

	drm_dbg_dp(ctrl->drm_dev, "TU: valid_boundary_link: %d\n",

				tu_table->valid_boundary_link);

	DRM_DEBUG_DP("TU: delay_start_link: %d\n",

	drm_dbg_dp(ctrl->drm_dev, "TU: delay_start_link: %d\n",

				tu_table->delay_start_link);

	DRM_DEBUG_DP("TU: boundary_moderation_en: %d\n",

	drm_dbg_dp(ctrl->drm_dev, "TU: boundary_moderation_en: %d\n",

			tu_table->boundary_moderation_en);

	DRM_DEBUG_DP("TU: valid_lower_boundary_link: %d\n",

	drm_dbg_dp(ctrl->drm_dev, "TU: valid_lower_boundary_link: %d\n",

			tu_table->valid_lower_boundary_link);

	DRM_DEBUG_DP("TU: upper_boundary_count: %d\n",

	drm_dbg_dp(ctrl->drm_dev, "TU: upper_boundary_count: %d\n",

			tu_table->upper_boundary_count);

	DRM_DEBUG_DP("TU: lower_boundary_count: %d\n",

	drm_dbg_dp(ctrl->drm_dev, "TU: lower_boundary_count: %d\n",

			tu_table->lower_boundary_count);

	DRM_DEBUG_DP("TU: tu_size_minus1: %d\n", tu_table->tu_size_minus1);

	drm_dbg_dp(ctrl->drm_dev, "TU: tu_size_minus1: %d\n",

			tu_table->tu_size_minus1);



	kfree(tu);

}
@@ -953,7 +958,7 @@ static void dp_ctrl_calc_tu_parameters(struct dp_ctrl_private *ctrl, 
	in.num_of_dsc_slices = 0;

	in.compress_ratio = 100;



	_dp_ctrl_calc_tu(&in, tu_table);

	_dp_ctrl_calc_tu(ctrl, &in, tu_table);

}



static void dp_ctrl_setup_tr_unit(struct dp_ctrl_private *ctrl)
@@ -1004,8 +1009,9 @@ static int dp_ctrl_update_vx_px(struct dp_ctrl_private *ctrl) 
	u32 voltage_swing_level = link->phy_params.v_level;

	u32 pre_emphasis_level = link->phy_params.p_level;



	DRM_DEBUG_DP("voltage level: %d emphasis level: %d\n", voltage_swing_level,

			pre_emphasis_level);

	drm_dbg_dp(ctrl->drm_dev,

		"voltage level: %d emphasis level: %d\n",

			voltage_swing_level, pre_emphasis_level);

	ret = dp_catalog_ctrl_update_vx_px(ctrl->catalog,

		voltage_swing_level, pre_emphasis_level);
@@ -1013,13 +1019,15 @@ static int dp_ctrl_update_vx_px(struct dp_ctrl_private *ctrl) 
		return ret;



	if (voltage_swing_level >= DP_TRAIN_VOLTAGE_SWING_MAX) {

		DRM_DEBUG_DP("max. voltage swing level reached %d\n",

		drm_dbg_dp(ctrl->drm_dev,

				"max. voltage swing level reached %d\n",

				voltage_swing_level);

		max_level_reached |= DP_TRAIN_MAX_SWING_REACHED;

	}



	if (pre_emphasis_level >= DP_TRAIN_PRE_EMPHASIS_MAX) {

		DRM_DEBUG_DP("max. pre-emphasis level reached %d\n",

		drm_dbg_dp(ctrl->drm_dev,

				"max. pre-emphasis level reached %d\n",

				pre_emphasis_level);

		max_level_reached  |= DP_TRAIN_MAX_PRE_EMPHASIS_REACHED;

	}
@@ -1031,8 +1039,8 @@ static int dp_ctrl_update_vx_px(struct dp_ctrl_private *ctrl) 
		buf[lane] = voltage_swing_level | pre_emphasis_level

				| max_level_reached;



	DRM_DEBUG_DP("sink: p|v=0x%x\n", voltage_swing_level

					| pre_emphasis_level);

	drm_dbg_dp(ctrl->drm_dev, "sink: p|v=0x%x\n",

			voltage_swing_level | pre_emphasis_level);

	ret = drm_dp_dpcd_write(ctrl->aux, DP_TRAINING_LANE0_SET,

					buf, lane_cnt);

	if (ret == lane_cnt)
@@ -1047,7 +1055,7 @@ static bool dp_ctrl_train_pattern_set(struct dp_ctrl_private *ctrl, 
	u8 buf;

	int ret = 0;



	DRM_DEBUG_DP("sink: pattern=%x\n", pattern);

	drm_dbg_dp(ctrl->drm_dev, "sink: pattern=%x\n", pattern);



	buf = pattern;
@@ -1118,8 +1126,6 @@ static int dp_ctrl_link_train_1(struct dp_ctrl_private *ctrl, 
			old_v_level = ctrl->link->phy_params.v_level;

		}



		DRM_DEBUG_DP("clock recovery not done, adjusting vx px\n");



		dp_link_adjust_levels(ctrl->link, link_status);

		ret = dp_ctrl_update_vx_px(ctrl);

		if (ret)
@@ -1150,8 +1156,10 @@ static int dp_ctrl_link_rate_down_shift(struct dp_ctrl_private *ctrl) 
		break;

	}



	if (!ret)

		DRM_DEBUG_DP("new rate=0x%x\n", ctrl->link->link_params.rate);

	if (!ret) {

		drm_dbg_dp(ctrl->drm_dev, "new rate=0x%x\n",

				ctrl->link->link_params.rate);

	}



	return ret;

}
@@ -1270,7 +1278,7 @@ static int dp_ctrl_link_train(struct dp_ctrl_private *ctrl, 
	}



	/* print success info as this is a result of user initiated action */

	DRM_DEBUG_DP("link training #1 successful\n");

	drm_dbg_dp(ctrl->drm_dev, "link training #1 successful\n");



	ret = dp_ctrl_link_train_2(ctrl, training_step);

	if (ret) {
@@ -1279,7 +1287,7 @@ static int dp_ctrl_link_train(struct dp_ctrl_private *ctrl, 
	}



	/* print success info as this is a result of user initiated action */

	DRM_DEBUG_DP("link training #2 successful\n");

	drm_dbg_dp(ctrl->drm_dev, "link training #2 successful\n");



end:

	dp_catalog_ctrl_state_ctrl(ctrl->catalog, 0);
@@ -1319,7 +1327,8 @@ static void dp_ctrl_set_clock_rate(struct dp_ctrl_private *ctrl, 
		cfg++;

	}



	DRM_DEBUG_DP("setting rate=%lu on clk=%s\n", rate, name);

	drm_dbg_dp(ctrl->drm_dev, "setting rate=%lu on clk=%s\n",

						rate, name);



	if (num)

		cfg->rate = rate;
@@ -1349,7 +1358,7 @@ static int dp_ctrl_enable_mainlink_clocks(struct dp_ctrl_private *ctrl) 
	if (ret)

		DRM_ERROR("Unable to start link clocks. ret=%d\n", ret);



	DRM_DEBUG_DP("link rate=%d pixel_clk=%d\n",

	drm_dbg_dp(ctrl->drm_dev, "link rate=%d pixel_clk=%d\n",

		ctrl->link->link_params.rate, ctrl->dp_ctrl.pixel_rate);



	return ret;
@@ -1366,7 +1375,7 @@ static int dp_ctrl_enable_stream_clocks(struct dp_ctrl_private *ctrl) 
	if (ret)

		DRM_ERROR("Unabled to start pixel clocks. ret=%d\n", ret);



	DRM_DEBUG_DP("link rate=%d pixel_clk=%d\n",

	drm_dbg_dp(ctrl->drm_dev, "link rate=%d pixel_clk=%d\n",

			ctrl->link->link_params.rate, ctrl->dp_ctrl.pixel_rate);



	return ret;
@@ -1396,7 +1405,8 @@ void dp_ctrl_phy_init(struct dp_ctrl *dp_ctrl) 


	dp_catalog_ctrl_phy_reset(ctrl->catalog);

	phy_init(phy);

	DRM_DEBUG_DP("phy=%p init=%d power_on=%d\n",



	drm_dbg_dp(ctrl->drm_dev, "phy=%p init=%d power_on=%d\n",

			phy, phy->init_count, phy->power_count);

}
@@ -1412,7 +1422,7 @@ void dp_ctrl_phy_exit(struct dp_ctrl *dp_ctrl) 


	dp_catalog_ctrl_phy_reset(ctrl->catalog);

	phy_exit(phy);

	DRM_DEBUG_DP("phy=%p init=%d power_on=%d\n",

	drm_dbg_dp(ctrl->drm_dev, "phy=%p init=%d power_on=%d\n",

			phy, phy->init_count, phy->power_count);

}
@@ -1488,7 +1498,7 @@ static int dp_ctrl_deinitialize_mainlink(struct dp_ctrl_private *ctrl) 
	phy_exit(phy);

	phy_init(phy);



	DRM_DEBUG_DP("phy=%p init=%d power_on=%d\n",

	drm_dbg_dp(ctrl->drm_dev, "phy=%p init=%d power_on=%d\n",

			phy, phy->init_count, phy->power_count);

	return 0;

}
@@ -1523,7 +1533,8 @@ static int dp_ctrl_process_phy_test_request(struct dp_ctrl_private *ctrl) 
	int ret = 0;



	if (!ctrl->link->phy_params.phy_test_pattern_sel) {

		DRM_DEBUG_DP("no test pattern selected by sink\n");

		drm_dbg_dp(ctrl->drm_dev,

			"no test pattern selected by sink\n");

		return ret;

	}
@@ -1553,7 +1564,7 @@ static bool dp_ctrl_send_phy_test_pattern(struct dp_ctrl_private *ctrl) 
	u32 pattern_sent = 0x0;

	u32 pattern_requested = ctrl->link->phy_params.phy_test_pattern_sel;



	DRM_DEBUG_DP("request: 0x%x\n", pattern_requested);

	drm_dbg_dp(ctrl->drm_dev, "request: 0x%x\n", pattern_requested);



	if (dp_catalog_ctrl_update_vx_px(ctrl->catalog,

			ctrl->link->phy_params.v_level,
@@ -1594,8 +1605,8 @@ static bool dp_ctrl_send_phy_test_pattern(struct dp_ctrl_private *ctrl) 
		success = false;

	}



	DRM_DEBUG_DP("%s: test->0x%x\n", success ? "success" : "failed",

						pattern_requested);

	drm_dbg_dp(ctrl->drm_dev, "%s: test->0x%x\n",

		success ? "success" : "failed", pattern_requested);

	return success;

}
@@ -1613,7 +1624,7 @@ void dp_ctrl_handle_sink_request(struct dp_ctrl *dp_ctrl) 
	sink_request = ctrl->link->sink_request;



	if (sink_request & DP_TEST_LINK_PHY_TEST_PATTERN) {

		DRM_DEBUG_DP("PHY_TEST_PATTERN request\n");

		drm_dbg_dp(ctrl->drm_dev, "PHY_TEST_PATTERN request\n");

		if (dp_ctrl_process_phy_test_request(ctrl)) {

			DRM_ERROR("process phy_test_req failed\n");

			return;
@@ -1685,7 +1696,8 @@ int dp_ctrl_on_link(struct dp_ctrl *dp_ctrl) 
	dp_power_clk_enable(ctrl->power, DP_CORE_PM, true);



	if (ctrl->link->sink_request & DP_TEST_LINK_PHY_TEST_PATTERN) {

		DRM_DEBUG_DP("using phy test link parameters\n");

		drm_dbg_dp(ctrl->drm_dev,

				"using phy test link parameters\n");

		if (!ctrl->panel->dp_mode.drm_mode.clock)

			ctrl->dp_ctrl.pixel_rate = phy_cts_pixel_clk_khz;

	} else {
@@ -1695,9 +1707,9 @@ int dp_ctrl_on_link(struct dp_ctrl *dp_ctrl) 
		ctrl->dp_ctrl.pixel_rate = ctrl->panel->dp_mode.drm_mode.clock;

	}



	DRM_DEBUG_DP("rate=%d, num_lanes=%d, pixel_rate=%d\n",

		ctrl->link->link_params.rate,

		ctrl->link->link_params.num_lanes, ctrl->dp_ctrl.pixel_rate);

	drm_dbg_dp(ctrl->drm_dev, "rate=%d, num_lanes=%d, pixel_rate=%d\n",

		ctrl->link->link_params.rate, ctrl->link->link_params.num_lanes,

		ctrl->dp_ctrl.pixel_rate);



	ctrl->link->phy_params.p_level = 0;

	ctrl->link->phy_params.v_level = 0;
@@ -1815,7 +1827,7 @@ int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl) 
	if (dp_ctrl->wide_bus_en)

		ctrl->dp_ctrl.pixel_rate >>= 1;



	DRM_DEBUG_DP("rate=%d, num_lanes=%d, pixel_rate=%d\n",

	drm_dbg_dp(ctrl->drm_dev, "rate=%d, num_lanes=%d, pixel_rate=%d\n",

		ctrl->link->link_params.rate,

		ctrl->link->link_params.num_lanes, ctrl->dp_ctrl.pixel_rate);
@@ -1865,7 +1877,8 @@ int dp_ctrl_on_stream(struct dp_ctrl *dp_ctrl) 
		return ret;



	mainlink_ready = dp_catalog_ctrl_mainlink_ready(ctrl->catalog);

	DRM_DEBUG_DP("mainlink %s\n", mainlink_ready ? "READY" : "NOT READY");

	drm_dbg_dp(ctrl->drm_dev,

		"mainlink %s\n", mainlink_ready ? "READY" : "NOT READY");



end:

	return ret;
@@ -1901,16 +1914,13 @@ int dp_ctrl_off_link_stream(struct dp_ctrl *dp_ctrl) 
		return ret;

	}



	DRM_DEBUG_DP("Before, phy=%x init_count=%d power_on=%d\n",

		(u32)(uintptr_t)phy, phy->init_count, phy->power_count);



	phy_power_off(phy);



	/* aux channel down, reinit phy */

	phy_exit(phy);

	phy_init(phy);



	DRM_DEBUG_DP("phy=%p init=%d power_on=%d\n",

	drm_dbg_dp(ctrl->drm_dev, "phy=%p init=%d power_on=%d\n",

			phy, phy->init_count, phy->power_count);

	return ret;

}
@@ -1943,7 +1953,7 @@ int dp_ctrl_off(struct dp_ctrl *dp_ctrl) 
	}



	phy_power_off(phy);

	DRM_DEBUG_DP("phy=%p init=%d power_on=%d\n",

	drm_dbg_dp(ctrl->drm_dev, "phy=%p init=%d power_on=%d\n",

			phy, phy->init_count, phy->power_count);



	return ret;
@@ -1962,12 +1972,12 @@ void dp_ctrl_isr(struct dp_ctrl *dp_ctrl) 
	isr = dp_catalog_ctrl_get_interrupt(ctrl->catalog);



	if (isr & DP_CTRL_INTR_READY_FOR_VIDEO) {

		DRM_DEBUG_DP("dp_video_ready\n");

		drm_dbg_dp(ctrl->drm_dev, "dp_video_ready\n");

		complete(&ctrl->video_comp);

	}



	if (isr & DP_CTRL_INTR_IDLE_PATTERN_SENT) {

		DRM_DEBUG_DP("idle_patterns_sent\n");

		drm_dbg_dp(ctrl->drm_dev, "idle_patterns_sent\n");

		complete(&ctrl->idle_comp);

	}

}

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

+40 −28

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static enum drm_connector_status dp_bridge_detect(struct drm_bridge *bridge) 


	dp = to_dp_bridge(bridge)->dp_display;



	DRM_DEBUG_DP("is_connected = %s\n",

	drm_dbg_dp(dp->drm_dev, "is_connected = %s\n",

		(dp->is_connected) ? "true" : "false");



	return (dp->is_connected) ? connector_status_connected :
@@ -81,7 +81,7 @@ static int dp_bridge_get_modes(struct drm_bridge *bridge, struct drm_connector * 
			drm_mode_probed_add(connector, m);

		}

	} else {

		DRM_DEBUG_DP("No sink connected\n");

		drm_dbg_dp(connector->dev, "No sink connected\n");

	}

	kfree(dp_mode);

	return rc;