Unverified Commit f8e1fa0f authored by Xin Ji's avatar Xin Ji Committed by Robert Foss
Browse files

drm/bridge: anx7625: Support HDMI_I2S audio format 



1. Support HDMI_I2S audio format.
2. Return 0 if there is no sink connection in .hw_param callback.

Signed-off-by: default avatarXin Ji <xji@analogixsemi.com>
Acked-by: default avatarHsin-Yi Wang <hsinyi@chromium.org>
Acked-by: default avatarJiaxin <Yu&lt;jiaxin.yu@mediatek.com>
Signed-off-by: default avatarRobert Foss <robert.foss@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220726033058.403715-1-xji@analogixsemi.com
parent 291f269a

drivers/gpu/drm/bridge/analogix/anx7625.c

+17 −6
Original line number Diff line number Diff line
@@ -1797,8 +1797,13 @@ static int anx7625_audio_hw_params(struct device *dev, void *data, 
	int wl, ch, rate;

	int ret = 0;



	if (fmt->fmt != HDMI_DSP_A) {

		DRM_DEV_ERROR(dev, "only supports DSP_A\n");

	if (anx7625_sink_detect(ctx) == connector_status_disconnected) {

		DRM_DEV_DEBUG_DRIVER(dev, "DP not connected\n");

		return 0;

	}



	if (fmt->fmt != HDMI_DSP_A && fmt->fmt != HDMI_I2S) {

		DRM_DEV_ERROR(dev, "only supports DSP_A & I2S\n");

		return -EINVAL;

	}
@@ -1806,10 +1811,16 @@ static int anx7625_audio_hw_params(struct device *dev, void *data, 
			     params->sample_rate, params->sample_width,

			     params->cea.channels);



	ret |= anx7625_write_and_or(ctx, ctx->i2c.tx_p2_client,

	if (fmt->fmt == HDMI_DSP_A)

		ret = anx7625_write_and_or(ctx, ctx->i2c.tx_p2_client,

					   AUDIO_CHANNEL_STATUS_6,

					   ~I2S_SLAVE_MODE,

					   TDM_SLAVE_MODE);

	else

		ret = anx7625_write_and_or(ctx, ctx->i2c.tx_p2_client,

					   AUDIO_CHANNEL_STATUS_6,

					   ~TDM_SLAVE_MODE,

					   I2S_SLAVE_MODE);



	/* Word length */

	switch (params->sample_width) {