Commit 98a8920e authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Dmitry Baryshkov
Browse files

drm/msm/dp: reuse generic HDMI codec implementation 



The MSM DisplayPort driver implements several HDMI codec functions
in the driver, e.g. it manually manages HDMI codec device registration,
returning ELD and plugged_cb support. In order to reduce code
duplication reuse drm_hdmi_audio_* helpers and drm_bridge_connector
integration.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/649728/
Link: https://lore.kernel.org/r/20250423-dp-hdmi-audio-v7-1-8407a23e55b2@oss.qualcomm.com
parent 075667e9

drivers/gpu/drm/msm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ config DRM_MSM_DPU 
config DRM_MSM_DP

	bool "Enable DisplayPort support in MSM DRM driver"

	depends on DRM_MSM

	select DRM_DISPLAY_HDMI_AUDIO_HELPER

	select RATIONAL

	default y

	help

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

+12 −119
Original line number Diff line number Diff line
@@ -13,13 +13,13 @@ 


#include "dp_catalog.h"

#include "dp_audio.h"

#include "dp_drm.h"

#include "dp_panel.h"

#include "dp_reg.h"

#include "dp_display.h"

#include "dp_utils.h"



struct msm_dp_audio_private {

	struct platform_device *audio_pdev;

	struct platform_device *pdev;

	struct drm_device *drm_dev;

	struct msm_dp_catalog *catalog;
@@ -160,24 +160,11 @@ static void msm_dp_audio_enable(struct msm_dp_audio_private *audio, bool enable) 
	msm_dp_catalog_audio_enable(catalog, enable);

}



static struct msm_dp_audio_private *msm_dp_audio_get_data(struct platform_device *pdev)

static struct msm_dp_audio_private *msm_dp_audio_get_data(struct msm_dp *msm_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);

	}



	msm_dp_display = platform_get_drvdata(pdev);

	if (!msm_dp_display) {

		DRM_ERROR("invalid input\n");

		return ERR_PTR(-ENODEV);

	}



	msm_dp_audio = msm_dp_display->msm_dp_audio;



	if (!msm_dp_audio) {

		DRM_ERROR("invalid msm_dp_audio data\n");

		return ERR_PTR(-EINVAL);
@@ -186,68 +173,16 @@ static struct msm_dp_audio_private *msm_dp_audio_get_data(struct platform_device 
	return container_of(msm_dp_audio, struct msm_dp_audio_private, msm_dp_audio);

}



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 *msm_dp_display;



	pdev = to_platform_device(dev);

	if (!pdev) {

		pr_err("invalid input\n");

		return -ENODEV;

	}



	msm_dp_display = platform_get_drvdata(pdev);

	if (!msm_dp_display) {

		pr_err("invalid input\n");

		return -ENODEV;

	}



	return msm_dp_display_set_plugged_cb(msm_dp_display, fn, codec_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 *msm_dp_display;



	pdev = to_platform_device(dev);



	if (!pdev) {

		DRM_ERROR("invalid input\n");

		return -ENODEV;

	}



	msm_dp_display = platform_get_drvdata(pdev);

	if (!msm_dp_display) {

		DRM_ERROR("invalid input\n");

		return -ENODEV;

	}



	mutex_lock(&msm_dp_display->connector->eld_mutex);

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

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

	mutex_unlock(&msm_dp_display->connector->eld_mutex);



	return 0;

}



int msm_dp_audio_hw_params(struct device *dev,

	void *data,

int msm_dp_audio_prepare(struct drm_connector *connector,

			 struct drm_bridge *bridge,

			 struct hdmi_codec_daifmt *daifmt,

			 struct hdmi_codec_params *params)

{

	int rc = 0;

	struct msm_dp_audio_private *audio;

	struct platform_device *pdev;

	struct msm_dp *msm_dp_display;



	pdev = to_platform_device(dev);

	msm_dp_display = platform_get_drvdata(pdev);

	msm_dp_display = to_dp_bridge(bridge)->msm_dp_display;



	/*

	 * there could be cases where sound card can be opened even
@@ -262,7 +197,7 @@ int msm_dp_audio_hw_params(struct device *dev, 
		goto end;

	}



	audio = msm_dp_audio_get_data(pdev);

	audio = msm_dp_audio_get_data(msm_dp_display);

	if (IS_ERR(audio)) {

		rc = PTR_ERR(audio);

		goto end;
@@ -281,15 +216,14 @@ int msm_dp_audio_hw_params(struct device *dev, 
	return rc;

}



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

void msm_dp_audio_shutdown(struct drm_connector *connector,

			   struct drm_bridge *bridge)

{

	struct msm_dp_audio_private *audio;

	struct platform_device *pdev;

	struct msm_dp *msm_dp_display;



	pdev = to_platform_device(dev);

	msm_dp_display = platform_get_drvdata(pdev);

	audio = msm_dp_audio_get_data(pdev);

	msm_dp_display = to_dp_bridge(bridge)->msm_dp_display;

	audio = msm_dp_audio_get_data(msm_dp_display);

	if (IS_ERR(audio)) {

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

		return;
@@ -311,47 +245,6 @@ static void msm_dp_audio_shutdown(struct device *dev, void *data) 
	msm_dp_display_signal_audio_complete(msm_dp_display);

}



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 = &msm_dp_audio_codec_ops,

	.max_i2s_channels = 8,

	.i2s = 1,

};



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

{

	struct msm_dp_audio_private *audio_priv;



	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);

		audio_priv->audio_pdev = NULL;

	}

}



int msm_dp_register_audio_driver(struct device *dev,

		struct msm_dp_audio *msm_dp_audio)

{

	struct msm_dp_audio_private *audio_priv;



	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,

						PLATFORM_DEVID_AUTO,

						&codec_data,

						sizeof(codec_data));

	return PTR_ERR_OR_ZERO(audio_priv->audio_pdev);

}



struct msm_dp_audio *msm_dp_audio_get(struct platform_device *pdev,

			struct msm_dp_catalog *catalog)

{

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

+6 −21
Original line number Diff line number Diff line
@@ -35,23 +35,6 @@ struct msm_dp_audio { 
struct msm_dp_audio *msm_dp_audio_get(struct platform_device *pdev,

			struct msm_dp_catalog *catalog);



/**

 * msm_dp_register_audio_driver()

 *

 * Registers DP device with hdmi_codec interface.

 *

 * @dev: DP device instance.

 * @msm_dp_audio: an instance of msm_dp_audio module.

 *

 *

 * Returns the error code in case of failure, otherwise

 * zero on success.

 */

int msm_dp_register_audio_driver(struct device *dev,

		struct msm_dp_audio *msm_dp_audio);



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



/**

 * msm_dp_audio_put()

 *
@@ -61,10 +44,12 @@ void msm_dp_unregister_audio_driver(struct device *dev, struct msm_dp_audio *msm 
 */

void msm_dp_audio_put(struct msm_dp_audio *msm_dp_audio);



int msm_dp_audio_hw_params(struct device *dev,

	void *data,

int msm_dp_audio_prepare(struct drm_connector *connector,

			 struct drm_bridge *bridge,

			 struct hdmi_codec_daifmt *daifmt,

			 struct hdmi_codec_params *params);

void msm_dp_audio_shutdown(struct drm_connector *connector,

			   struct drm_bridge *bridge);



#endif /* _DP_AUDIO_H_ */

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

+4 −24
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/delay.h>

#include <linux/string_choices.h>

#include <drm/display/drm_dp_aux_bus.h>

#include <drm/display/drm_hdmi_audio_helper.h>

#include <drm/drm_edid.h>



#include "msm_drv.h"
@@ -288,13 +289,6 @@ static int msm_dp_display_bind(struct device *dev, struct device *master, 
		goto end;

	}





	rc = msm_dp_register_audio_driver(dev, dp->audio);

	if (rc) {

		DRM_ERROR("Audio registration Dp failed\n");

		goto end;

	}



	rc = msm_dp_hpd_event_thread_start(dp);

	if (rc) {

		DRM_ERROR("Event thread create failed\n");
@@ -316,7 +310,6 @@ static void msm_dp_display_unbind(struct device *dev, struct device *master, 


	of_dp_aux_depopulate_bus(dp->aux);



	msm_dp_unregister_audio_driver(dev, dp->audio);

	msm_dp_aux_unregister(dp->aux);

	dp->drm_dev = NULL;

	dp->aux->drm_dev = NULL;
@@ -626,9 +619,9 @@ static void msm_dp_display_handle_plugged_change(struct msm_dp *msm_dp_display, 
			struct msm_dp_display_private, msm_dp_display);



	/* notify audio subsystem only if sink supports audio */

	if (msm_dp_display->plugged_cb && msm_dp_display->codec_dev &&

			dp->audio_supported)

		msm_dp_display->plugged_cb(msm_dp_display->codec_dev, plugged);

	if (dp->audio_supported)

		drm_connector_hdmi_audio_plugged_notify(msm_dp_display->connector,

							plugged);

}



static int msm_dp_hpd_unplug_handle(struct msm_dp_display_private *dp, u32 data)
@@ -907,19 +900,6 @@ static int msm_dp_display_disable(struct msm_dp_display_private *dp) 
	return 0;

}



int msm_dp_display_set_plugged_cb(struct msm_dp *msm_dp_display,

		hdmi_codec_plugged_cb fn, struct device *codec_dev)

{

	bool plugged;



	msm_dp_display->plugged_cb = fn;

	msm_dp_display->codec_dev = codec_dev;

	plugged = msm_dp_display->link_ready;

	msm_dp_display_handle_plugged_change(msm_dp_display, plugged);



	return 0;

}



/**

 * msm_dp_bridge_mode_valid - callback to determine if specified mode is valid

 * @bridge: Pointer to drm bridge structure

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

+0 −6
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#define _DP_DISPLAY_H_



#include "dp_panel.h"

#include <sound/hdmi-codec.h>

#include "disp/msm_disp_snapshot.h"



#define DP_MAX_PIXEL_CLK_KHZ	675000
@@ -15,7 +14,6 @@ 
struct msm_dp {

	struct drm_device *drm_dev;

	struct platform_device *pdev;

	struct device *codec_dev;

	struct drm_connector *connector;

	struct drm_bridge *next_bridge;

	bool link_ready;
@@ -25,14 +23,10 @@ struct msm_dp { 
	bool is_edp;

	bool internal_hpd;



	hdmi_codec_plugged_cb plugged_cb;



	struct msm_dp_audio *msm_dp_audio;

	bool psr_supported;

};



int msm_dp_display_set_plugged_cb(struct msm_dp *msm_dp_display,

		hdmi_codec_plugged_cb fn, struct device *codec_dev);

int msm_dp_display_get_modes(struct msm_dp *msm_dp_display);

bool msm_dp_display_check_video_test(struct msm_dp *msm_dp_display);

int msm_dp_display_get_test_bpp(struct msm_dp *msm_dp_display);