* [PATCH RESEND] drm: bridge: adv7511: Support I2S IEC958 encoded PCM format
@ 2021-04-22 6:40 Sia Jee Heng
2021-04-23 8:33 ` Robert Foss
0 siblings, 1 reply; 2+ messages in thread
From: Sia Jee Heng @ 2021-04-22 6:40 UTC (permalink / raw)
To: dri-devel, Laurent.pinchart, narmstrong, jonas, a.hajda
Cc: pierre-louis.bossart, jee.heng.sia, linux-kernel
Support IEC958 encoded PCM format for ADV7511 so that ADV7511 HDMI
audio driver can accept the IEC958 data from the I2S input.
Signed-off-by: Sia Jee Heng <jee.heng.sia@intel.com>
Reviewed-by: Robert Foss <robert.foss@linaro.org>
---
drivers/gpu/drm/bridge/adv7511/adv7511.h | 1 +
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 6 ++++++
2 files changed, 7 insertions(+)
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h b/drivers/gpu/drm/bridge/adv7511/adv7511.h
index a9bb734366ae..05e3abb5a0c9 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511.h
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h
@@ -191,6 +191,7 @@
#define ADV7511_I2S_FORMAT_I2S 0
#define ADV7511_I2S_FORMAT_RIGHT_J 1
#define ADV7511_I2S_FORMAT_LEFT_J 2
+#define ADV7511_I2S_IEC958_DIRECT 3
#define ADV7511_PACKET(p, x) ((p) * 0x20 + (x))
#define ADV7511_PACKET_SDP(x) ADV7511_PACKET(0, x)
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c b/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
index 45838bd08d37..61f4a38e7d2b 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
@@ -101,6 +101,10 @@ static int adv7511_hdmi_hw_params(struct device *dev, void *data,
case 20:
len = ADV7511_I2S_SAMPLE_LEN_20;
break;
+ case 32:
+ if (fmt->bit_fmt != SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE)
+ return -EINVAL;
+ fallthrough;
case 24:
len = ADV7511_I2S_SAMPLE_LEN_24;
break;
@@ -112,6 +116,8 @@ static int adv7511_hdmi_hw_params(struct device *dev, void *data,
case HDMI_I2S:
audio_source = ADV7511_AUDIO_SOURCE_I2S;
i2s_format = ADV7511_I2S_FORMAT_I2S;
+ if (fmt->bit_fmt == SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE)
+ i2s_format = ADV7511_I2S_IEC958_DIRECT;
break;
case HDMI_RIGHT_J:
audio_source = ADV7511_AUDIO_SOURCE_I2S;
base-commit: e488b1023a4a4eab15b905871cf8e81f00336ed7
--
2.18.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH RESEND] drm: bridge: adv7511: Support I2S IEC958 encoded PCM format
2021-04-22 6:40 [PATCH RESEND] drm: bridge: adv7511: Support I2S IEC958 encoded PCM format Sia Jee Heng
@ 2021-04-23 8:33 ` Robert Foss
0 siblings, 0 replies; 2+ messages in thread
From: Robert Foss @ 2021-04-23 8:33 UTC (permalink / raw)
To: Sia Jee Heng
Cc: Jonas Karlman, Neil Armstrong, pierre-louis.bossart, dri-devel,
linux-kernel, Andrzej Hajda, Laurent Pinchart
Hey Sia,
Thanks for the reminder!
I've merged this patch to drm-misc-next.
https://cgit.freedesktop.org/drm/drm-misc/log/
On Thu, 22 Apr 2021 at 08:57, Sia Jee Heng <jee.heng.sia@intel.com> wrote:
>
> Support IEC958 encoded PCM format for ADV7511 so that ADV7511 HDMI
> audio driver can accept the IEC958 data from the I2S input.
>
> Signed-off-by: Sia Jee Heng <jee.heng.sia@intel.com>
> Reviewed-by: Robert Foss <robert.foss@linaro.org>
> ---
> drivers/gpu/drm/bridge/adv7511/adv7511.h | 1 +
> drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 6 ++++++
> 2 files changed, 7 insertions(+)
>
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h b/drivers/gpu/drm/bridge/adv7511/adv7511.h
> index a9bb734366ae..05e3abb5a0c9 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511.h
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h
> @@ -191,6 +191,7 @@
> #define ADV7511_I2S_FORMAT_I2S 0
> #define ADV7511_I2S_FORMAT_RIGHT_J 1
> #define ADV7511_I2S_FORMAT_LEFT_J 2
> +#define ADV7511_I2S_IEC958_DIRECT 3
>
> #define ADV7511_PACKET(p, x) ((p) * 0x20 + (x))
> #define ADV7511_PACKET_SDP(x) ADV7511_PACKET(0, x)
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c b/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
> index 45838bd08d37..61f4a38e7d2b 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
> @@ -101,6 +101,10 @@ static int adv7511_hdmi_hw_params(struct device *dev, void *data,
> case 20:
> len = ADV7511_I2S_SAMPLE_LEN_20;
> break;
> + case 32:
> + if (fmt->bit_fmt != SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE)
> + return -EINVAL;
> + fallthrough;
> case 24:
> len = ADV7511_I2S_SAMPLE_LEN_24;
> break;
> @@ -112,6 +116,8 @@ static int adv7511_hdmi_hw_params(struct device *dev, void *data,
> case HDMI_I2S:
> audio_source = ADV7511_AUDIO_SOURCE_I2S;
> i2s_format = ADV7511_I2S_FORMAT_I2S;
> + if (fmt->bit_fmt == SNDRV_PCM_FORMAT_IEC958_SUBFRAME_LE)
> + i2s_format = ADV7511_I2S_IEC958_DIRECT;
> break;
> case HDMI_RIGHT_J:
> audio_source = ADV7511_AUDIO_SOURCE_I2S;
>
> base-commit: e488b1023a4a4eab15b905871cf8e81f00336ed7
> --
> 2.18.0
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-23 8:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-22 6:40 [PATCH RESEND] drm: bridge: adv7511: Support I2S IEC958 encoded PCM format Sia Jee Heng
2021-04-23 8:33 ` Robert Foss
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).