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

drm/bridge: adv7511: switch to the HDMI connector helpers 



Rewrite the ADV7511 driver to use implementation provided by the DRM
HDMI connector framework, including the Audio and CEC bits. Drop the
in-bridge connector support and use drm_bridge_connector if the host
requires the connector to be provided by the bridge.

Note: currently only AVI InfoFrames are supported. Existing driver
doesn't support programming any other InfoFrames directly and Audio
InfoFrame seems to be programmed using individual bits and pieces rather
than programming it directly.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarMaxime Ripard <mripard@kernel.org>
Link: https://lore.kernel.org/r/20250517-drm-hdmi-connector-cec-v6-10-35651db6f19b@oss.qualcomm.com


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
parent a74288c8

drivers/gpu/drm/bridge/adv7511/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ config DRM_I2C_ADV7511 
	select DRM_KMS_HELPER

	select REGMAP_I2C

	select DRM_MIPI_DSI

	select DRM_DISPLAY_HELPER

	select DRM_BRIDGE_CONNECTOR

	select DRM_DISPLAY_HDMI_STATE_HELPER

	help

	  Support for the Analog Devices ADV7511(W)/13/33/35 HDMI encoders.
@@ -19,7 +22,7 @@ config DRM_I2C_ADV7511_AUDIO 
config DRM_I2C_ADV7511_CEC

	bool "ADV7511/33/35 HDMI CEC driver"

	depends on DRM_I2C_ADV7511

	select CEC_CORE

	select DRM_DISPLAY_HDMI_CEC_HELPER

	default y

	help

	  When selected the HDMI transmitter will support the CEC feature.

drivers/gpu/drm/bridge/adv7511/adv7511.h

+28 −24
Original line number Diff line number Diff line
@@ -313,16 +313,11 @@ enum adv7511_csc_scaling { 
 * @csc_enable:			Whether to enable color space conversion

 * @csc_scaling_factor:		Color space conversion scaling factor

 * @csc_coefficents:		Color space conversion coefficents

 * @hdmi_mode:			Whether to use HDMI or DVI output mode

 * @avi_infoframe:		HDMI infoframe

 */

struct adv7511_video_config {

	bool csc_enable;

	enum adv7511_csc_scaling csc_scaling_factor;

	const uint16_t *csc_coefficents;



	bool hdmi_mode;

	struct hdmi_avi_infoframe avi_infoframe;

};



enum adv7511_type {
@@ -337,6 +332,7 @@ struct adv7511_chip_info { 
	enum adv7511_type type;

	unsigned int max_mode_clock_khz;

	unsigned int max_lane_freq_khz;

	const char *name;

	const char * const *supply_names;

	unsigned int num_supplies;

	unsigned int reg_cec_offset;
@@ -371,7 +367,7 @@ struct adv7511 { 
	struct work_struct hpd_work;



	struct drm_bridge bridge;

	struct drm_connector connector;

	struct drm_connector *cec_connector;



	bool embedded_sync;

	enum adv7511_sync_polarity vsync_polarity;
@@ -389,9 +385,7 @@ struct adv7511 { 
	bool use_timing_gen;



	const struct adv7511_chip_info *info;

	struct platform_device *audio_pdev;



	struct cec_adapter *cec_adap;

	u8   cec_addr[ADV7511_MAX_ADDRS];

	u8   cec_valid_addrs;

	bool cec_enabled_adap;
@@ -399,16 +393,24 @@ struct adv7511 { 
	u32 cec_clk_freq;

};



static inline struct adv7511 *bridge_to_adv7511(struct drm_bridge *bridge)

{

	return container_of(bridge, struct adv7511, bridge);

}



#ifdef CONFIG_DRM_I2C_ADV7511_CEC

int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511);

int adv7511_cec_init(struct drm_connector *connector,

		     struct drm_bridge *bridge);

int adv7511_cec_enable(struct drm_bridge *bridge, bool enable);

int adv7511_cec_log_addr(struct drm_bridge *bridge, u8 addr);

int adv7511_cec_transmit(struct drm_bridge *bridge, u8 attempts,

			 u32 signal_free_time, struct cec_msg *msg);

int adv7511_cec_irq_process(struct adv7511 *adv7511, unsigned int irq1);

#else

static inline int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511)

{

	regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL,

		     ADV7511_CEC_CTRL_POWER_DOWN);

	return 0;

}

#define adv7511_cec_init NULL

#define adv7511_cec_enable NULL

#define adv7511_cec_log_addr NULL

#define adv7511_cec_transmit NULL

#endif



void adv7533_dsi_power_on(struct adv7511 *adv);
@@ -421,16 +423,18 @@ int adv7533_attach_dsi(struct adv7511 *adv); 
int adv7533_parse_dt(struct device_node *np, struct adv7511 *adv);



#ifdef CONFIG_DRM_I2C_ADV7511_AUDIO

int adv7511_audio_init(struct device *dev, struct adv7511 *adv7511);

void adv7511_audio_exit(struct adv7511 *adv7511);

int adv7511_hdmi_audio_startup(struct drm_connector *connector,

			       struct drm_bridge *bridge);

void adv7511_hdmi_audio_shutdown(struct drm_connector *connector,

				 struct drm_bridge *bridge);

int adv7511_hdmi_audio_prepare(struct drm_connector *connector,

			       struct drm_bridge *bridge,

			       struct hdmi_codec_daifmt *fmt,

			       struct hdmi_codec_params *hparms);

#else /*CONFIG_DRM_I2C_ADV7511_AUDIO */

static inline int adv7511_audio_init(struct device *dev, struct adv7511 *adv7511)

{

	return 0;

}

static inline void adv7511_audio_exit(struct adv7511 *adv7511)

{

}

#define adv7511_hdmi_audio_startup NULL

#define adv7511_hdmi_audio_shutdown NULL

#define adv7511_hdmi_audio_prepare NULL

#endif /* CONFIG_DRM_I2C_ADV7511_AUDIO */



#endif /* __DRM_I2C_ADV7511_H__ */

drivers/gpu/drm/bridge/adv7511/adv7511_audio.c

+11 −66
Original line number Diff line number Diff line
@@ -55,11 +55,12 @@ static int adv7511_update_cts_n(struct adv7511 *adv7511) 
	return 0;

}



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

int adv7511_hdmi_audio_prepare(struct drm_connector *connector,

			       struct drm_bridge *bridge,

			       struct hdmi_codec_daifmt *fmt,

			       struct hdmi_codec_params *hparms)

{

	struct adv7511 *adv7511 = dev_get_drvdata(dev);

	struct adv7511 *adv7511 = bridge_to_adv7511(bridge);

	unsigned int audio_source, i2s_format = 0;

	unsigned int invert_clock;

	unsigned int rate;
@@ -167,9 +168,10 @@ static int adv7511_hdmi_hw_params(struct device *dev, void *data, 
	return 0;

}



static int audio_startup(struct device *dev, void *data)

int adv7511_hdmi_audio_startup(struct drm_connector *connector,

			       struct drm_bridge *bridge)

{

	struct adv7511 *adv7511 = dev_get_drvdata(dev);

	struct adv7511 *adv7511 = bridge_to_adv7511(bridge);



	regmap_update_bits(adv7511->regmap, ADV7511_REG_AUDIO_CONFIG,

				BIT(7), 0);
@@ -204,69 +206,12 @@ static int audio_startup(struct device *dev, void *data) 
	return 0;

}



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

void adv7511_hdmi_audio_shutdown(struct drm_connector *connector,

				 struct drm_bridge *bridge)

{

	struct adv7511 *adv7511 = dev_get_drvdata(dev);

	struct adv7511 *adv7511 = bridge_to_adv7511(bridge);



	if (adv7511->audio_source == ADV7511_AUDIO_SOURCE_SPDIF)

		regmap_update_bits(adv7511->regmap, ADV7511_REG_AUDIO_CONFIG,

				   BIT(7), 0);

}
 


static int adv7511_hdmi_i2s_get_dai_id(struct snd_soc_component *component,

					struct device_node *endpoint,

					void *data)

{

	struct of_endpoint of_ep;

	int ret;



	ret = of_graph_parse_endpoint(endpoint, &of_ep);

	if (ret < 0)

		return ret;



	/*

	 * HDMI sound should be located as reg = <2>

	 * Then, it is sound port 0

	 */

	if (of_ep.port == 2)

		return 0;



	return -EINVAL;

}



static const struct hdmi_codec_ops adv7511_codec_ops = {

	.hw_params	= adv7511_hdmi_hw_params,

	.audio_shutdown = audio_shutdown,

	.audio_startup	= audio_startup,

	.get_dai_id	= adv7511_hdmi_i2s_get_dai_id,

};



static const struct hdmi_codec_pdata codec_data = {

	.ops = &adv7511_codec_ops,

	.i2s_formats = (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |

			SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S24_LE |

			SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE),

	.max_i2s_channels = 2,

	.i2s = 1,

	.no_i2s_capture = 1,

	.spdif = 1,

	.no_spdif_capture = 1,

};



int adv7511_audio_init(struct device *dev, struct adv7511 *adv7511)

{

	adv7511->audio_pdev = platform_device_register_data(dev,

					HDMI_CODEC_DRV_NAME,

					PLATFORM_DEVID_AUTO,

					&codec_data,

					sizeof(codec_data));

	return PTR_ERR_OR_ZERO(adv7511->audio_pdev);

}



void adv7511_audio_exit(struct adv7511 *adv7511)

{

	if (adv7511->audio_pdev) {

		platform_device_unregister(adv7511->audio_pdev);

		adv7511->audio_pdev = NULL;

	}

}

drivers/gpu/drm/bridge/adv7511/adv7511_cec.c

+22 −35
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 


#include <media/cec.h>



#include <drm/display/drm_hdmi_cec_helper.h>



#include "adv7511.h"



static const u8 ADV7511_REG_CEC_RX_FRAME_HDR[] = {
@@ -44,7 +46,7 @@ static void adv_cec_tx_raw_status(struct adv7511 *adv7511, u8 tx_raw_status) 
		return;



	if (tx_raw_status & ADV7511_INT1_CEC_TX_ARBIT_LOST) {

		cec_transmit_attempt_done(adv7511->cec_adap,

		drm_connector_hdmi_cec_transmit_attempt_done(adv7511->cec_connector,

							     CEC_TX_STATUS_ARB_LOST);

		return;

	}
@@ -72,12 +74,14 @@ static void adv_cec_tx_raw_status(struct adv7511 *adv7511, u8 tx_raw_status) 
			if (low_drive_cnt)

				status |= CEC_TX_STATUS_LOW_DRIVE;

		}

		cec_transmit_done(adv7511->cec_adap, status,

				  0, nack_cnt, low_drive_cnt, err_cnt);

		drm_connector_hdmi_cec_transmit_done(adv7511->cec_connector, status,

						     0, nack_cnt, low_drive_cnt,

						     err_cnt);

		return;

	}

	if (tx_raw_status & ADV7511_INT1_CEC_TX_READY) {

		cec_transmit_attempt_done(adv7511->cec_adap, CEC_TX_STATUS_OK);

		drm_connector_hdmi_cec_transmit_attempt_done(adv7511->cec_connector,

							     CEC_TX_STATUS_OK);

		return;

	}

}
@@ -116,7 +120,7 @@ static void adv7511_cec_rx(struct adv7511 *adv7511, int rx_buf) 
	regmap_update_bits(adv7511->regmap_cec,

			   ADV7511_REG_CEC_RX_BUFFERS + offset, BIT(rx_buf), 0);



	cec_received_msg(adv7511->cec_adap, &msg);

	drm_connector_hdmi_cec_received_msg(adv7511->cec_connector, &msg);

}



int adv7511_cec_irq_process(struct adv7511 *adv7511, unsigned int irq1)
@@ -179,9 +183,9 @@ int adv7511_cec_irq_process(struct adv7511 *adv7511, unsigned int irq1) 
	return IRQ_HANDLED;

}



static int adv7511_cec_adap_enable(struct cec_adapter *adap, bool enable)

int adv7511_cec_enable(struct drm_bridge *bridge, bool enable)

{

	struct adv7511 *adv7511 = cec_get_drvdata(adap);

	struct adv7511 *adv7511 = bridge_to_adv7511(bridge);

	unsigned int offset = adv7511->info->reg_cec_offset;



	if (adv7511->i2c_cec == NULL)
@@ -225,9 +229,9 @@ static int adv7511_cec_adap_enable(struct cec_adapter *adap, bool enable) 
	return 0;

}



static int adv7511_cec_adap_log_addr(struct cec_adapter *adap, u8 addr)

int adv7511_cec_log_addr(struct drm_bridge *bridge, u8 addr)

{

	struct adv7511 *adv7511 = cec_get_drvdata(adap);

	struct adv7511 *adv7511 = bridge_to_adv7511(bridge);

	unsigned int offset = adv7511->info->reg_cec_offset;

	unsigned int i, free_idx = ADV7511_MAX_ADDRS;
@@ -293,10 +297,10 @@ static int adv7511_cec_adap_log_addr(struct cec_adapter *adap, u8 addr) 
	return 0;

}



static int adv7511_cec_adap_transmit(struct cec_adapter *adap, u8 attempts,

int adv7511_cec_transmit(struct drm_bridge *bridge, u8 attempts,

			 u32 signal_free_time, struct cec_msg *msg)

{

	struct adv7511 *adv7511 = cec_get_drvdata(adap);

	struct adv7511 *adv7511 = bridge_to_adv7511(bridge);

	unsigned int offset = adv7511->info->reg_cec_offset;

	u8 len = msg->len;

	unsigned int i;
@@ -328,12 +332,6 @@ static int adv7511_cec_adap_transmit(struct cec_adapter *adap, u8 attempts, 
	return 0;

}



static const struct cec_adap_ops adv7511_cec_adap_ops = {

	.adap_enable = adv7511_cec_adap_enable,

	.adap_log_addr = adv7511_cec_adap_log_addr,

	.adap_transmit = adv7511_cec_adap_transmit,

};



static int adv7511_cec_parse_dt(struct device *dev, struct adv7511 *adv7511)

{

	adv7511->cec_clk = devm_clk_get(dev, "cec");
@@ -348,20 +346,18 @@ static int adv7511_cec_parse_dt(struct device *dev, struct adv7511 *adv7511) 
	return 0;

}



int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511)

int adv7511_cec_init(struct drm_connector *connector,

		     struct drm_bridge *bridge)

{

	struct adv7511 *adv7511 = bridge_to_adv7511(bridge);

	struct device *dev = &adv7511->i2c_main->dev;

	unsigned int offset = adv7511->info->reg_cec_offset;

	int ret = adv7511_cec_parse_dt(dev, adv7511);



	if (ret)

		goto err_cec_parse_dt;



	adv7511->cec_adap = cec_allocate_adapter(&adv7511_cec_adap_ops,

		adv7511, dev_name(dev), CEC_CAP_DEFAULTS, ADV7511_MAX_ADDRS);

	if (IS_ERR(adv7511->cec_adap)) {

		ret = PTR_ERR(adv7511->cec_adap);

		goto err_cec_alloc;

	}

	adv7511->cec_connector = connector;



	regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL, 0);

	/* cec soft reset */
@@ -378,17 +374,8 @@ int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511) 
		     ADV7511_REG_CEC_CLK_DIV + offset,

		     ((adv7511->cec_clk_freq / 750000) - 1) << 2);



	ret = cec_register_adapter(adv7511->cec_adap, dev);

	if (ret)

		goto err_cec_register;

	return 0;



err_cec_register:

	cec_delete_adapter(adv7511->cec_adap);

	adv7511->cec_adap = NULL;

err_cec_alloc:

	dev_info(dev, "Initializing CEC failed with error %d, disabling CEC\n",

		 ret);

err_cec_parse_dt:

	regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL,

		     ADV7511_CEC_CTRL_POWER_DOWN);

drivers/gpu/drm/bridge/adv7511/adv7511_drv.c

+147 −198

File changed.

Preview size limit exceeded, changes collapsed.