raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-25 11:32:24 +00:00
Code Issues Projects Releases Wiki Activity

drm/vc4: add iec958 controls to vc4_hdmi

Browse Source 
Although vc4 get an IEC958 formatted stream passed in from userspace
the driver needs the info from the channel status bits to properly
set up the hardware, eg for HBR passthrough.

Add iec958 controls so the channel status bits can be passed in
from userspace.

Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
Matthias Reichl
2020-03-17 12:12:22 +01:00
committed by Dom Cobley
parent d518cd8b07
commit cb2bccec99
2 changed files with 62 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
drivers/gpu/drm/vc4/vc4_hdmi.c
View File

@@ -45,6 +45,7 @@
#include <linux/pm_runtime.h>
#include <linux/rational.h>
#include <linux/reset.h>
#include <sound/asoundef.h>
#include <sound/dmaengine_pcm.h>
#include <sound/pcm_drm_eld.h>
#include <sound/pcm_params.h>
@@ -1478,6 +1479,47 @@ static int vc4_hdmi_audio_eld_ctl_get(struct snd_kcontrol *kcontrol,
return 0;
}
static int vc4_spdif_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
uinfo->count = 1;
return 0;
}
static int vc4_spdif_playback_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
struct vc4_hdmi *vc4_hdmi = snd_component_to_hdmi(component);
memcpy(ucontrol->value.iec958.status, vc4_hdmi->audio.iec_status,
sizeof(vc4_hdmi->audio.iec_status));
return 0;
}
static int vc4_spdif_playback_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
struct vc4_hdmi *vc4_hdmi = snd_component_to_hdmi(component);
memcpy(vc4_hdmi->audio.iec_status, ucontrol->value.iec958.status,
sizeof(vc4_hdmi->audio.iec_status));
return 0;
}
static int vc4_spdif_mask_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
memset(ucontrol->value.iec958.status, 0xff,
sizeof_field(struct vc4_hdmi_audio, iec_status));
return 0;
}
static const struct snd_kcontrol_new vc4_hdmi_audio_controls[] = {
{
.access = SNDRV_CTL_ELEM_ACCESS_READ |
@@ -1487,6 +1529,19 @@ static const struct snd_kcontrol_new vc4_hdmi_audio_controls[] = {
.info = vc4_hdmi_audio_eld_ctl_info,
.get = vc4_hdmi_audio_eld_ctl_get,
},
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT),
.info = vc4_spdif_info,
.get = vc4_spdif_playback_get,
.put = vc4_spdif_playback_put,
},
{
.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, MASK),
.info = vc4_spdif_info,
.get = vc4_spdif_mask_get,
},
};
static const struct snd_soc_dapm_widget vc4_hdmi_audio_widgets[] = {
@@ -1607,6 +1662,11 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi)
vc4_hdmi->audio.dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
vc4_hdmi->audio.dma_data.maxburst = 2;
vc4_hdmi->audio.iec_status[0] = IEC958_AES0_CON_NOT_COPYRIGHT;
vc4_hdmi->audio.iec_status[1] =
IEC958_AES1_CON_ORIGINAL | IEC958_AES1_CON_PCM_CODER;
vc4_hdmi->audio.iec_status[3] = IEC958_AES3_CON_FS_48000;
ret = devm_snd_dmaengine_pcm_register(dev, &pcm_conf, 0);
if (ret) {
dev_err(dev, "Could not register PCM component: %d\n", ret);

2
drivers/gpu/drm/vc4/vc4_hdmi.h
View File

@@ -117,6 +117,8 @@ struct vc4_hdmi_audio {
struct snd_pcm_substream *substream;
bool streaming;
unsigned char iec_status[4];
};
/* General HDMI hardware state. */