drm/vc4: Unify PCM card's driver_name
diff mbox series

Message ID 20210115191209.12852-1-nsaenzjulienne@suse.de
State Accepted
Commit 33c74535b03ecf11359de14bc88302595b1de44f
Headers show
Series
  • drm/vc4: Unify PCM card's driver_name
Related show

Commit Message

Nicolas Saenz Julienne Jan. 15, 2021, 7:12 p.m. UTC
User-space ALSA matches a card's driver name against an internal list of
aliases in order to select the correct configuration for the system.
When the driver name isn't defined, the match is performed against the
card's name.

With the introduction of RPi4 we now have two HDMI ports with two
distinct audio cards. This is reflected in their names, making them
different from previous RPi versions. With this, ALSA ultimately misses
the board's configuration on RPi4.

In order to avoid this, set "card->driver_name" to "vc4-hdmi"
unanimously.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Fixes: f437bc1ec731 ("drm/vc4: drv: Support BCM2711")
---
 drivers/gpu/drm/vc4/vc4_hdmi.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Takashi Iwai Jan. 17, 2021, 7:57 a.m. UTC | #1
On Fri, 15 Jan 2021 20:12:09 +0100,
Nicolas Saenz Julienne wrote:
> 
> User-space ALSA matches a card's driver name against an internal list of
> aliases in order to select the correct configuration for the system.
> When the driver name isn't defined, the match is performed against the
> card's name.
> 
> With the introduction of RPi4 we now have two HDMI ports with two
> distinct audio cards. This is reflected in their names, making them
> different from previous RPi versions. With this, ALSA ultimately misses
> the board's configuration on RPi4.
> 
> In order to avoid this, set "card->driver_name" to "vc4-hdmi"
> unanimously.
> 
> Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
> Fixes: f437bc1ec731 ("drm/vc4: drv: Support BCM2711")

Looks good to me.
Reviewed-by: Takashi Iwai <tiwai@suse.de>


thanks,

Takashi

> ---
>  drivers/gpu/drm/vc4/vc4_hdmi.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
> index 97f368bc1c67..4bdc8e71b5e5 100644
> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> @@ -1404,6 +1404,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi)
>  	card->dai_link = dai_link;
>  	card->num_links = 1;
>  	card->name = vc4_hdmi->variant->card_name;
> +	card->driver_name = "vc4-hdmi";
>  	card->dev = dev;
>  	card->owner = THIS_MODULE;
>  
> -- 
> 2.29.2
>
Maxime Ripard Jan. 18, 2021, 10:04 a.m. UTC | #2
On Fri, Jan 15, 2021 at 08:12:09PM +0100, Nicolas Saenz Julienne wrote:
> User-space ALSA matches a card's driver name against an internal list of
> aliases in order to select the correct configuration for the system.
> When the driver name isn't defined, the match is performed against the
> card's name.
> 
> With the introduction of RPi4 we now have two HDMI ports with two
> distinct audio cards. This is reflected in their names, making them
> different from previous RPi versions. With this, ALSA ultimately misses
> the board's configuration on RPi4.
> 
> In order to avoid this, set "card->driver_name" to "vc4-hdmi"
> unanimously.
> 
> Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
> Fixes: f437bc1ec731 ("drm/vc4: drv: Support BCM2711")

Applied, thanks
Maxime

Patch
diff mbox series

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 97f368bc1c67..4bdc8e71b5e5 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -1404,6 +1404,7 @@  static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi)
 	card->dai_link = dai_link;
 	card->num_links = 1;
 	card->name = vc4_hdmi->variant->card_name;
+	card->driver_name = "vc4-hdmi";
 	card->dev = dev;
 	card->owner = THIS_MODULE;