Commit fb7d509b authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dp: prefix all symbols with msm_dp_ 



For historical reasons a lot of symbols in the MSM DisplayPort driver
used the generic dp_ prefix. Perform a mass-rename of those symbols to
use msm_dp prefix.

Basically this is a result of the following script:

sed drivers/gpu/drm/msm/dp/* -i -e 's/\<dp_/msm_dp_/g'
sed drivers/gpu/drm/msm/dp/* -i -e 's/"msm_dp_/"dp_/g'
sed drivers/gpu/drm/msm/dp/* -i -e 's/msm_\(dp_sdp_header\|dp_sdp\)\>/\1/g'

Yes, this also results in renaming of several struct fields in addition
to renaming the structs and functions, but I think the simple solution
is better than the more complex one.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202410250305.UHKDhtxy-lkp@intel.com/


Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/622211/
Link: https://lore.kernel.org/r/20241029-msm-dp-rename-v2-1-13c5c03fad44@linaro.org
parent 4a6fd066

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

+147 −147
Original line number Diff line number Diff line
@@ -17,281 +17,281 @@ 
#include "dp_display.h"

#include "dp_utils.h"



struct dp_audio_private {

struct msm_dp_audio_private {

	struct platform_device *audio_pdev;

	struct platform_device *pdev;

	struct drm_device *drm_dev;

	struct dp_catalog *catalog;

	struct msm_dp_catalog *catalog;



	u32 channels;



	struct dp_audio dp_audio;

	struct msm_dp_audio msm_dp_audio;

};



static u32 dp_audio_get_header(struct dp_catalog *catalog,

		enum dp_catalog_audio_sdp_type sdp,

		enum dp_catalog_audio_header_type header)

static u32 msm_dp_audio_get_header(struct msm_dp_catalog *catalog,

		enum msm_dp_catalog_audio_sdp_type sdp,

		enum msm_dp_catalog_audio_header_type header)

{

	return dp_catalog_audio_get_header(catalog, sdp, header);

	return msm_dp_catalog_audio_get_header(catalog, sdp, header);

}



static void dp_audio_set_header(struct dp_catalog *catalog,

static void msm_dp_audio_set_header(struct msm_dp_catalog *catalog,

		u32 data,

		enum dp_catalog_audio_sdp_type sdp,

		enum dp_catalog_audio_header_type header)

		enum msm_dp_catalog_audio_sdp_type sdp,

		enum msm_dp_catalog_audio_header_type header)

{

	dp_catalog_audio_set_header(catalog, sdp, header, data);

	msm_dp_catalog_audio_set_header(catalog, sdp, header, data);

}



static void dp_audio_stream_sdp(struct dp_audio_private *audio)

static void msm_dp_audio_stream_sdp(struct msm_dp_audio_private *audio)

{

	struct dp_catalog *catalog = audio->catalog;

	struct msm_dp_catalog *catalog = audio->catalog;

	u32 value, new_value;

	u8 parity_byte;



	/* Config header and parity byte 1 */

	value = dp_audio_get_header(catalog,

	value = msm_dp_audio_get_header(catalog,

			DP_AUDIO_SDP_STREAM, DP_AUDIO_SDP_HEADER_1);



	new_value = 0x02;

	parity_byte = dp_utils_calculate_parity(new_value);

	parity_byte = msm_dp_utils_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_1_BIT)

			| (parity_byte << PARITY_BYTE_1_BIT));

	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,

	msm_dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_STREAM, DP_AUDIO_SDP_HEADER_1);



	/* Config header and parity byte 2 */

	value = dp_audio_get_header(catalog,

	value = msm_dp_audio_get_header(catalog,

			DP_AUDIO_SDP_STREAM, DP_AUDIO_SDP_HEADER_2);

	new_value = value;

	parity_byte = dp_utils_calculate_parity(new_value);

	parity_byte = msm_dp_utils_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_2_BIT)

			| (parity_byte << PARITY_BYTE_2_BIT));

	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,

	msm_dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_STREAM, DP_AUDIO_SDP_HEADER_2);



	/* Config header and parity byte 3 */

	value = dp_audio_get_header(catalog,

	value = msm_dp_audio_get_header(catalog,

			DP_AUDIO_SDP_STREAM, DP_AUDIO_SDP_HEADER_3);



	new_value = audio->channels - 1;

	parity_byte = dp_utils_calculate_parity(new_value);

	parity_byte = msm_dp_utils_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_3_BIT)

			| (parity_byte << PARITY_BYTE_3_BIT));

	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,

	msm_dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_STREAM, DP_AUDIO_SDP_HEADER_3);

}



static void dp_audio_timestamp_sdp(struct dp_audio_private *audio)

static void msm_dp_audio_timestamp_sdp(struct msm_dp_audio_private *audio)

{

	struct dp_catalog *catalog = audio->catalog;

	struct msm_dp_catalog *catalog = audio->catalog;

	u32 value, new_value;

	u8 parity_byte;



	/* Config header and parity byte 1 */

	value = dp_audio_get_header(catalog,

	value = msm_dp_audio_get_header(catalog,

			DP_AUDIO_SDP_TIMESTAMP, DP_AUDIO_SDP_HEADER_1);



	new_value = 0x1;

	parity_byte = dp_utils_calculate_parity(new_value);

	parity_byte = msm_dp_utils_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_1_BIT)

			| (parity_byte << PARITY_BYTE_1_BIT));

	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,

	msm_dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_TIMESTAMP, DP_AUDIO_SDP_HEADER_1);



	/* Config header and parity byte 2 */

	value = dp_audio_get_header(catalog,

	value = msm_dp_audio_get_header(catalog,

			DP_AUDIO_SDP_TIMESTAMP, DP_AUDIO_SDP_HEADER_2);



	new_value = 0x17;

	parity_byte = dp_utils_calculate_parity(new_value);

	parity_byte = msm_dp_utils_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_2_BIT)

			| (parity_byte << PARITY_BYTE_2_BIT));

	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,

	msm_dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_TIMESTAMP, DP_AUDIO_SDP_HEADER_2);



	/* Config header and parity byte 3 */

	value = dp_audio_get_header(catalog,

	value = msm_dp_audio_get_header(catalog,

			DP_AUDIO_SDP_TIMESTAMP, DP_AUDIO_SDP_HEADER_3);



	new_value = (0x0 | (0x11 << 2));

	parity_byte = dp_utils_calculate_parity(new_value);

	parity_byte = msm_dp_utils_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_3_BIT)

			| (parity_byte << PARITY_BYTE_3_BIT));

	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,

	msm_dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_TIMESTAMP, DP_AUDIO_SDP_HEADER_3);

}



static void dp_audio_infoframe_sdp(struct dp_audio_private *audio)

static void msm_dp_audio_infoframe_sdp(struct msm_dp_audio_private *audio)

{

	struct dp_catalog *catalog = audio->catalog;

	struct msm_dp_catalog *catalog = audio->catalog;

	u32 value, new_value;

	u8 parity_byte;



	/* Config header and parity byte 1 */

	value = dp_audio_get_header(catalog,

	value = msm_dp_audio_get_header(catalog,

			DP_AUDIO_SDP_INFOFRAME, DP_AUDIO_SDP_HEADER_1);



	new_value = 0x84;

	parity_byte = dp_utils_calculate_parity(new_value);

	parity_byte = msm_dp_utils_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_1_BIT)

			| (parity_byte << PARITY_BYTE_1_BIT));

	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,

	msm_dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_INFOFRAME, DP_AUDIO_SDP_HEADER_1);



	/* Config header and parity byte 2 */

	value = dp_audio_get_header(catalog,

	value = msm_dp_audio_get_header(catalog,

			DP_AUDIO_SDP_INFOFRAME, DP_AUDIO_SDP_HEADER_2);



	new_value = 0x1b;

	parity_byte = dp_utils_calculate_parity(new_value);

	parity_byte = msm_dp_utils_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_2_BIT)

			| (parity_byte << PARITY_BYTE_2_BIT));

	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,

	msm_dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_INFOFRAME, DP_AUDIO_SDP_HEADER_2);



	/* Config header and parity byte 3 */

	value = dp_audio_get_header(catalog,

	value = msm_dp_audio_get_header(catalog,

			DP_AUDIO_SDP_INFOFRAME, DP_AUDIO_SDP_HEADER_3);



	new_value = (0x0 | (0x11 << 2));

	parity_byte = dp_utils_calculate_parity(new_value);

	parity_byte = msm_dp_utils_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_3_BIT)

			| (parity_byte << PARITY_BYTE_3_BIT));

	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,

	msm_dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_INFOFRAME, DP_AUDIO_SDP_HEADER_3);

}



static void dp_audio_copy_management_sdp(struct dp_audio_private *audio)

static void msm_dp_audio_copy_management_sdp(struct msm_dp_audio_private *audio)

{

	struct dp_catalog *catalog = audio->catalog;

	struct msm_dp_catalog *catalog = audio->catalog;

	u32 value, new_value;

	u8 parity_byte;



	/* Config header and parity byte 1 */

	value = dp_audio_get_header(catalog,

	value = msm_dp_audio_get_header(catalog,

			DP_AUDIO_SDP_COPYMANAGEMENT, DP_AUDIO_SDP_HEADER_1);



	new_value = 0x05;

	parity_byte = dp_utils_calculate_parity(new_value);

	parity_byte = msm_dp_utils_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_1_BIT)

			| (parity_byte << PARITY_BYTE_1_BIT));

	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,

	msm_dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_COPYMANAGEMENT, DP_AUDIO_SDP_HEADER_1);



	/* Config header and parity byte 2 */

	value = dp_audio_get_header(catalog,

	value = msm_dp_audio_get_header(catalog,

			DP_AUDIO_SDP_COPYMANAGEMENT, DP_AUDIO_SDP_HEADER_2);



	new_value = 0x0F;

	parity_byte = dp_utils_calculate_parity(new_value);

	parity_byte = msm_dp_utils_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_2_BIT)

			| (parity_byte << PARITY_BYTE_2_BIT));

	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,

	msm_dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_COPYMANAGEMENT, DP_AUDIO_SDP_HEADER_2);



	/* Config header and parity byte 3 */

	value = dp_audio_get_header(catalog,

	value = msm_dp_audio_get_header(catalog,

			DP_AUDIO_SDP_COPYMANAGEMENT, DP_AUDIO_SDP_HEADER_3);



	new_value = 0x0;

	parity_byte = dp_utils_calculate_parity(new_value);

	parity_byte = msm_dp_utils_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_3_BIT)

			| (parity_byte << PARITY_BYTE_3_BIT));

	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,

	msm_dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_COPYMANAGEMENT, DP_AUDIO_SDP_HEADER_3);

}



static void dp_audio_isrc_sdp(struct dp_audio_private *audio)

static void msm_dp_audio_isrc_sdp(struct msm_dp_audio_private *audio)

{

	struct dp_catalog *catalog = audio->catalog;

	struct msm_dp_catalog *catalog = audio->catalog;

	u32 value, new_value;

	u8 parity_byte;



	/* Config header and parity byte 1 */

	value = dp_audio_get_header(catalog,

	value = msm_dp_audio_get_header(catalog,

			DP_AUDIO_SDP_ISRC, DP_AUDIO_SDP_HEADER_1);



	new_value = 0x06;

	parity_byte = dp_utils_calculate_parity(new_value);

	parity_byte = msm_dp_utils_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_1_BIT)

			| (parity_byte << PARITY_BYTE_1_BIT));

	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,

	msm_dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_ISRC, DP_AUDIO_SDP_HEADER_1);



	/* Config header and parity byte 2 */

	value = dp_audio_get_header(catalog,

	value = msm_dp_audio_get_header(catalog,

			DP_AUDIO_SDP_ISRC, DP_AUDIO_SDP_HEADER_2);



	new_value = 0x0F;

	parity_byte = dp_utils_calculate_parity(new_value);

	parity_byte = msm_dp_utils_calculate_parity(new_value);

	value |= ((new_value << HEADER_BYTE_2_BIT)

			| (parity_byte << PARITY_BYTE_2_BIT));

	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,

	msm_dp_audio_set_header(catalog, value,

		DP_AUDIO_SDP_ISRC, DP_AUDIO_SDP_HEADER_2);

}



static void dp_audio_setup_sdp(struct dp_audio_private *audio)

static void msm_dp_audio_setup_sdp(struct msm_dp_audio_private *audio)

{

	dp_catalog_audio_config_sdp(audio->catalog);

	msm_dp_catalog_audio_config_sdp(audio->catalog);



	dp_audio_stream_sdp(audio);

	dp_audio_timestamp_sdp(audio);

	dp_audio_infoframe_sdp(audio);

	dp_audio_copy_management_sdp(audio);

	dp_audio_isrc_sdp(audio);

	msm_dp_audio_stream_sdp(audio);

	msm_dp_audio_timestamp_sdp(audio);

	msm_dp_audio_infoframe_sdp(audio);

	msm_dp_audio_copy_management_sdp(audio);

	msm_dp_audio_isrc_sdp(audio);

}



static void dp_audio_setup_acr(struct dp_audio_private *audio)

static void msm_dp_audio_setup_acr(struct msm_dp_audio_private *audio)

{

	u32 select = 0;

	struct dp_catalog *catalog = audio->catalog;

	struct msm_dp_catalog *catalog = audio->catalog;



	switch (audio->dp_audio.bw_code) {

	switch (audio->msm_dp_audio.bw_code) {

	case DP_LINK_BW_1_62:

		select = 0;

		break;
@@ -310,15 +310,15 @@ static void dp_audio_setup_acr(struct dp_audio_private *audio) 
		break;

	}



	dp_catalog_audio_config_acr(catalog, select);

	msm_dp_catalog_audio_config_acr(catalog, select);

}



static void dp_audio_safe_to_exit_level(struct dp_audio_private *audio)

static void msm_dp_audio_safe_to_exit_level(struct msm_dp_audio_private *audio)

{

	struct dp_catalog *catalog = audio->catalog;

	struct msm_dp_catalog *catalog = audio->catalog;

	u32 safe_to_exit_level = 0;



	switch (audio->dp_audio.lane_count) {

	switch (audio->msm_dp_audio.lane_count) {

	case 1:

		safe_to_exit_level = 14;

		break;
@@ -336,49 +336,49 @@ static void dp_audio_safe_to_exit_level(struct dp_audio_private *audio) 
		break;

	}



	dp_catalog_audio_sfe_level(catalog, safe_to_exit_level);

	msm_dp_catalog_audio_sfe_level(catalog, safe_to_exit_level);

}



static void dp_audio_enable(struct dp_audio_private *audio, bool enable)

static void msm_dp_audio_enable(struct msm_dp_audio_private *audio, bool enable)

{

	struct dp_catalog *catalog = audio->catalog;

	struct msm_dp_catalog *catalog = audio->catalog;



	dp_catalog_audio_enable(catalog, enable);

	msm_dp_catalog_audio_enable(catalog, enable);

}



static struct dp_audio_private *dp_audio_get_data(struct platform_device *pdev)

static struct msm_dp_audio_private *msm_dp_audio_get_data(struct platform_device *pdev)

{

	struct dp_audio *dp_audio;

	struct msm_dp *dp_display;

	struct msm_dp_audio *msm_dp_audio;

	struct msm_dp *msm_dp_display;



	if (!pdev) {

		DRM_ERROR("invalid input\n");

		return ERR_PTR(-ENODEV);

	}



	dp_display = platform_get_drvdata(pdev);

	if (!dp_display) {

	msm_dp_display = platform_get_drvdata(pdev);

	if (!msm_dp_display) {

		DRM_ERROR("invalid input\n");

		return ERR_PTR(-ENODEV);

	}



	dp_audio = dp_display->dp_audio;

	msm_dp_audio = msm_dp_display->msm_dp_audio;



	if (!dp_audio) {

		DRM_ERROR("invalid dp_audio data\n");

	if (!msm_dp_audio) {

		DRM_ERROR("invalid msm_dp_audio data\n");

		return ERR_PTR(-EINVAL);

	}



	return container_of(dp_audio, struct dp_audio_private, dp_audio);

	return container_of(msm_dp_audio, struct msm_dp_audio_private, msm_dp_audio);

}



static int dp_audio_hook_plugged_cb(struct device *dev, void *data,

static int msm_dp_audio_hook_plugged_cb(struct device *dev, void *data,

		hdmi_codec_plugged_cb fn,

		struct device *codec_dev)

{



	struct platform_device *pdev;

	struct msm_dp *dp_display;

	struct msm_dp *msm_dp_display;



	pdev = to_platform_device(dev);

	if (!pdev) {
@@ -386,20 +386,20 @@ static int dp_audio_hook_plugged_cb(struct device *dev, void *data, 
		return -ENODEV;

	}



	dp_display = platform_get_drvdata(pdev);

	if (!dp_display) {

	msm_dp_display = platform_get_drvdata(pdev);

	if (!msm_dp_display) {

		pr_err("invalid input\n");

		return -ENODEV;

	}



	return dp_display_set_plugged_cb(dp_display, fn, codec_dev);

	return msm_dp_display_set_plugged_cb(msm_dp_display, fn, codec_dev);

}



static int dp_audio_get_eld(struct device *dev,

static int msm_dp_audio_get_eld(struct device *dev,

	void *data, uint8_t *buf, size_t len)

{

	struct platform_device *pdev;

	struct msm_dp *dp_display;

	struct msm_dp *msm_dp_display;



	pdev = to_platform_device(dev);
@@ -408,30 +408,30 @@ static int dp_audio_get_eld(struct device *dev, 
		return -ENODEV;

	}



	dp_display = platform_get_drvdata(pdev);

	if (!dp_display) {

	msm_dp_display = platform_get_drvdata(pdev);

	if (!msm_dp_display) {

		DRM_ERROR("invalid input\n");

		return -ENODEV;

	}



	memcpy(buf, dp_display->connector->eld,

		min(sizeof(dp_display->connector->eld), len));

	memcpy(buf, msm_dp_display->connector->eld,

		min(sizeof(msm_dp_display->connector->eld), len));



	return 0;

}



int dp_audio_hw_params(struct device *dev,

int msm_dp_audio_hw_params(struct device *dev,

	void *data,

	struct hdmi_codec_daifmt *daifmt,

	struct hdmi_codec_params *params)

{

	int rc = 0;

	struct dp_audio_private *audio;

	struct msm_dp_audio_private *audio;

	struct platform_device *pdev;

	struct msm_dp *dp_display;

	struct msm_dp *msm_dp_display;



	pdev = to_platform_device(dev);

	dp_display = platform_get_drvdata(pdev);

	msm_dp_display = platform_get_drvdata(pdev);



	/*

	 * there could be cases where sound card can be opened even
@@ -441,12 +441,12 @@ int dp_audio_hw_params(struct device *dev, 
	 * such cases check for connection status and bail out if not

	 * connected.

	 */

	if (!dp_display->power_on) {

	if (!msm_dp_display->power_on) {

		rc = -EINVAL;

		goto end;

	}



	audio = dp_audio_get_data(pdev);

	audio = msm_dp_audio_get_data(pdev);

	if (IS_ERR(audio)) {

		rc = PTR_ERR(audio);

		goto end;
@@ -454,26 +454,26 @@ int dp_audio_hw_params(struct device *dev, 


	audio->channels = params->channels;



	dp_audio_setup_sdp(audio);

	dp_audio_setup_acr(audio);

	dp_audio_safe_to_exit_level(audio);

	dp_audio_enable(audio, true);

	dp_display_signal_audio_start(dp_display);

	dp_display->audio_enabled = true;

	msm_dp_audio_setup_sdp(audio);

	msm_dp_audio_setup_acr(audio);

	msm_dp_audio_safe_to_exit_level(audio);

	msm_dp_audio_enable(audio, true);

	msm_dp_display_signal_audio_start(msm_dp_display);

	msm_dp_display->audio_enabled = true;



end:

	return rc;

}



static void dp_audio_shutdown(struct device *dev, void *data)

static void msm_dp_audio_shutdown(struct device *dev, void *data)

{

	struct dp_audio_private *audio;

	struct msm_dp_audio_private *audio;

	struct platform_device *pdev;

	struct msm_dp *dp_display;

	struct msm_dp *msm_dp_display;



	pdev = to_platform_device(dev);

	dp_display = platform_get_drvdata(pdev);

	audio = dp_audio_get_data(pdev);

	msm_dp_display = platform_get_drvdata(pdev);

	audio = msm_dp_audio_get_data(pdev);

	if (IS_ERR(audio)) {

		DRM_ERROR("failed to get audio data\n");

		return;
@@ -487,32 +487,32 @@ static void dp_audio_shutdown(struct device *dev, void *data) 
	 * connected. is_connected cannot be used here as its set

	 * to false earlier than this call

	 */

	if (!dp_display->audio_enabled)

	if (!msm_dp_display->audio_enabled)

		return;



	dp_audio_enable(audio, false);

	msm_dp_audio_enable(audio, false);

	/* signal the dp display to safely shutdown clocks */

	dp_display_signal_audio_complete(dp_display);

	msm_dp_display_signal_audio_complete(msm_dp_display);

}



static const struct hdmi_codec_ops dp_audio_codec_ops = {

	.hw_params = dp_audio_hw_params,

	.audio_shutdown = dp_audio_shutdown,

	.get_eld = dp_audio_get_eld,

	.hook_plugged_cb = dp_audio_hook_plugged_cb,

static const struct hdmi_codec_ops msm_dp_audio_codec_ops = {

	.hw_params = msm_dp_audio_hw_params,

	.audio_shutdown = msm_dp_audio_shutdown,

	.get_eld = msm_dp_audio_get_eld,

	.hook_plugged_cb = msm_dp_audio_hook_plugged_cb,

};



static struct hdmi_codec_pdata codec_data = {

	.ops = &dp_audio_codec_ops,

	.ops = &msm_dp_audio_codec_ops,

	.max_i2s_channels = 8,

	.i2s = 1,

};



void dp_unregister_audio_driver(struct device *dev, struct dp_audio *dp_audio)

void msm_dp_unregister_audio_driver(struct device *dev, struct msm_dp_audio *msm_dp_audio)

{

	struct dp_audio_private *audio_priv;

	struct msm_dp_audio_private *audio_priv;



	audio_priv = container_of(dp_audio, struct dp_audio_private, dp_audio);

	audio_priv = container_of(msm_dp_audio, struct msm_dp_audio_private, msm_dp_audio);



	if (audio_priv->audio_pdev) {

		platform_device_unregister(audio_priv->audio_pdev);
@@ -520,13 +520,13 @@ void dp_unregister_audio_driver(struct device *dev, struct dp_audio *dp_audio) 
	}

}



int dp_register_audio_driver(struct device *dev,

		struct dp_audio *dp_audio)

int msm_dp_register_audio_driver(struct device *dev,

		struct msm_dp_audio *msm_dp_audio)

{

	struct dp_audio_private *audio_priv;

	struct msm_dp_audio_private *audio_priv;



	audio_priv = container_of(dp_audio,

			struct dp_audio_private, dp_audio);

	audio_priv = container_of(msm_dp_audio,

			struct msm_dp_audio_private, msm_dp_audio);



	audio_priv->audio_pdev = platform_device_register_data(dev,

						HDMI_CODEC_DRV_NAME,
@@ -536,13 +536,13 @@ int dp_register_audio_driver(struct device *dev, 
	return PTR_ERR_OR_ZERO(audio_priv->audio_pdev);

}



struct dp_audio *dp_audio_get(struct platform_device *pdev,

			struct dp_panel *panel,

			struct dp_catalog *catalog)

struct msm_dp_audio *msm_dp_audio_get(struct platform_device *pdev,

			struct msm_dp_panel *panel,

			struct msm_dp_catalog *catalog)

{

	int rc = 0;

	struct dp_audio_private *audio;

	struct dp_audio *dp_audio;

	struct msm_dp_audio_private *audio;

	struct msm_dp_audio *msm_dp_audio;



	if (!pdev || !panel || !catalog) {

		DRM_ERROR("invalid input\n");
@@ -559,23 +559,23 @@ struct dp_audio *dp_audio_get(struct platform_device *pdev, 
	audio->pdev = pdev;

	audio->catalog = catalog;



	dp_audio = &audio->dp_audio;

	msm_dp_audio = &audio->msm_dp_audio;



	dp_catalog_audio_init(catalog);

	msm_dp_catalog_audio_init(catalog);



	return dp_audio;

	return msm_dp_audio;

error:

	return ERR_PTR(rc);

}



void dp_audio_put(struct dp_audio *dp_audio)

void msm_dp_audio_put(struct msm_dp_audio *msm_dp_audio)

{

	struct dp_audio_private *audio;

	struct msm_dp_audio_private *audio;



	if (!dp_audio)

	if (!msm_dp_audio)

		return;



	audio = container_of(dp_audio, struct dp_audio_private, dp_audio);

	audio = container_of(msm_dp_audio, struct msm_dp_audio_private, msm_dp_audio);



	devm_kfree(&audio->pdev->dev, audio);

}

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

+19 −19
Original line number Diff line number Diff line
@@ -13,58 +13,58 @@ 
#include <sound/hdmi-codec.h>



/**

 * struct dp_audio

 * struct msm_dp_audio

 * @lane_count: number of lanes configured in current session

 * @bw_code: link rate's bandwidth code for current session

 */

struct dp_audio {

struct msm_dp_audio {

	u32 lane_count;

	u32 bw_code;

};



/**

 * dp_audio_get()

 * msm_dp_audio_get()

 *

 * Creates and instance of dp audio.

 *

 * @pdev: caller's platform device instance.

 * @panel: an instance of dp_panel module.

 * @catalog: an instance of dp_catalog module.

 * @panel: an instance of msm_dp_panel module.

 * @catalog: an instance of msm_dp_catalog module.

 *

 * Returns the error code in case of failure, otherwize

 * an instance of newly created dp_module.

 * an instance of newly created msm_dp_module.

 */

struct dp_audio *dp_audio_get(struct platform_device *pdev,

			struct dp_panel *panel,

			struct dp_catalog *catalog);

struct msm_dp_audio *msm_dp_audio_get(struct platform_device *pdev,

			struct msm_dp_panel *panel,

			struct msm_dp_catalog *catalog);



/**

 * dp_register_audio_driver()

 * msm_dp_register_audio_driver()

 *

 * Registers DP device with hdmi_codec interface.

 *

 * @dev: DP device instance.

 * @dp_audio: an instance of dp_audio module.

 * @msm_dp_audio: an instance of msm_dp_audio module.

 *

 *

 * Returns the error code in case of failure, otherwise

 * zero on success.

 */

int dp_register_audio_driver(struct device *dev,

		struct dp_audio *dp_audio);

int msm_dp_register_audio_driver(struct device *dev,

		struct msm_dp_audio *msm_dp_audio);



void dp_unregister_audio_driver(struct device *dev, struct dp_audio *dp_audio);

void msm_dp_unregister_audio_driver(struct device *dev, struct msm_dp_audio *msm_dp_audio);



/**

 * dp_audio_put()

 * msm_dp_audio_put()

 *

 * Cleans the dp_audio instance.

 * Cleans the msm_dp_audio instance.

 *

 * @dp_audio: an instance of dp_audio.

 * @msm_dp_audio: an instance of msm_dp_audio.

 */

void dp_audio_put(struct dp_audio *dp_audio);

void msm_dp_audio_put(struct msm_dp_audio *msm_dp_audio);



int dp_audio_hw_params(struct device *dev,

int msm_dp_audio_hw_params(struct device *dev,

	void *data,

	struct hdmi_codec_daifmt *daifmt,

	struct hdmi_codec_params *params);

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

+74 −74

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/msm/dp/dp_aux.h

+9 −9
Original line number Diff line number Diff line
@@ -9,18 +9,18 @@ 
#include "dp_catalog.h"

#include <drm/display/drm_dp_helper.h>



int dp_aux_register(struct drm_dp_aux *dp_aux);

void dp_aux_unregister(struct drm_dp_aux *dp_aux);

irqreturn_t dp_aux_isr(struct drm_dp_aux *dp_aux);

void dp_aux_enable_xfers(struct drm_dp_aux *dp_aux, bool enabled);

void dp_aux_init(struct drm_dp_aux *dp_aux);

void dp_aux_deinit(struct drm_dp_aux *dp_aux);

void dp_aux_reconfig(struct drm_dp_aux *dp_aux);

int msm_dp_aux_register(struct drm_dp_aux *msm_dp_aux);

void msm_dp_aux_unregister(struct drm_dp_aux *msm_dp_aux);

irqreturn_t msm_dp_aux_isr(struct drm_dp_aux *msm_dp_aux);

void msm_dp_aux_enable_xfers(struct drm_dp_aux *msm_dp_aux, bool enabled);

void msm_dp_aux_init(struct drm_dp_aux *msm_dp_aux);

void msm_dp_aux_deinit(struct drm_dp_aux *msm_dp_aux);

void msm_dp_aux_reconfig(struct drm_dp_aux *msm_dp_aux);



struct phy;

struct drm_dp_aux *dp_aux_get(struct device *dev, struct dp_catalog *catalog,

struct drm_dp_aux *msm_dp_aux_get(struct device *dev, struct msm_dp_catalog *catalog,

			      struct phy *phy,

			      bool is_edp);

void dp_aux_put(struct drm_dp_aux *aux);

void msm_dp_aux_put(struct drm_dp_aux *aux);



#endif /*__DP_AUX_H_*/

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

+367 −367

File changed.

Preview size limit exceeded, changes collapsed.